Selim Cinek
552ed5a4ab
Merge "Adjusted the behavior when expanding the notification panel" into nyc-dev am: 8316fac9c0
...
am: f78f8345ca
* commit 'f78f8345ca1143459d0bd524fcab63626aa517a2':
Adjusted the behavior when expanding the notification panel
2016-03-03 02:05:00 +00:00
Selim Cinek
f78f8345ca
Merge "Adjusted the behavior when expanding the notification panel" into nyc-dev
...
am: 8316fac9c0
* commit '8316fac9c0772b1908d45b2286298b5b791d3ca7':
Adjusted the behavior when expanding the notification panel
2016-03-03 01:29:21 +00:00
Selim Cinek
d1ad9ab312
Adjusted the behavior when expanding the notification panel
...
The topmost notification is now not collapsed anymore but slides in
expanded from the top. Therefore it's layout doesn't need to animate
anymore. This also cleans up a lot of code in the algorithm which was
depending on this resizing which isn't needed anymore.
In order to have that transition working perfectly, the padding when
collapsing a card is now the same as the slowdown length.
Also improved the logic when notification contents are allowed to
animate and when not.
Also fixed a bug where the top notification was cut off when QS was
expanded.
Bug: 27402534
Bug: 18434284
Change-Id: I31afa199d38d94e74fd45500c2236ffdb51d989d
2016-03-02 23:54:38 +00:00
Jason Monk
3144393d96
Merge "Guard against battery tile crash" into nyc-dev am: f2bf0c4ba0
...
am: 58add15bb3
* commit '58add15bb340dc12c2d07e5afd6637a14e209a21':
Guard against battery tile crash
2016-03-02 22:43:35 +00:00
Jason Monk
8eb253b2f5
Merge "Fix crash while editing QS" into nyc-dev am: 25b86cca0f
...
am: 61964371d9
* commit '61964371d9085a6a33cee24760732f69d20d6a9e':
Fix crash while editing QS
2016-03-02 22:40:31 +00:00
Julia Reynolds
4cb6ecd7d5
Merge "Allow notifications to be hidden from lockscreen at a package level." into nyc-dev am: c523dc1ff9
...
am: 387ede7593
* commit '387ede75938b7beee1c38bfc887c7449fef9b68c':
Allow notifications to be hidden from lockscreen at a package level.
2016-03-02 21:53:48 +00:00
Jason Monk
70e6106850
Merge "Shrink button ripple on QS btns to 36dp" into nyc-dev am: 797b1ef39e
...
am: 88b31490b7
* commit '88b31490b79b9d75f9212995af94e80f562017a1':
Shrink button ripple on QS btns to 36dp
2016-03-02 21:48:45 +00:00
Jason Monk
c56640bc45
Merge "Add edit title to QS edit" into nyc-dev am: 4cabb1b91f
...
am: 15e637dafd
* commit '15e637dafd5e995ce74d51c11a696ed1c1e6407d':
Add edit title to QS edit
2016-03-02 21:42:12 +00:00
Jason Monk
58add15bb3
Merge "Guard against battery tile crash" into nyc-dev
...
am: f2bf0c4ba0
* commit 'f2bf0c4ba0a759b05a78ace4cb95c484a050aafe':
Guard against battery tile crash
2016-03-02 21:39:38 +00:00
Jason Monk
0f9fd3a2d0
Merge "Guard against monkey crash" into nyc-dev am: c04cf4baec
...
am: a2549ca8dd
* commit 'a2549ca8dd2b86251951e9ffc304ed44ad3dfff6':
Guard against monkey crash
2016-03-02 21:39:11 +00:00
Jason Monk
61964371d9
Merge "Fix crash while editing QS" into nyc-dev
...
am: 25b86cca0f
* commit '25b86cca0f97b644379a311769632ebb18c6f8fe':
Fix crash while editing QS
2016-03-02 21:37:27 +00:00
Jason Monk
f2bf0c4ba0
Merge "Guard against battery tile crash" into nyc-dev
2016-03-02 21:08:12 +00:00
Jason Monk
2462a50e8f
Guard against battery tile crash
...
Bug: 27419759
Change-Id: Ic152ab56f7648e7346cbddf21840bd5313e50d3c
2016-03-02 16:04:39 -05:00
Julia Reynolds
387ede7593
Merge "Allow notifications to be hidden from lockscreen at a package level." into nyc-dev
...
am: c523dc1ff9
* commit 'c523dc1ff9454bd8cd8fc9b00c39ea02409f93c4':
Allow notifications to be hidden from lockscreen at a package level.
2016-03-02 20:36:21 +00:00
Jason Monk
25b86cca0f
Merge "Fix crash while editing QS" into nyc-dev
2016-03-02 20:31:14 +00:00
Jason Monk
88b31490b7
Merge "Shrink button ripple on QS btns to 36dp" into nyc-dev
...
am: 797b1ef39e
* commit '797b1ef39ea4ddd7341483ee70a4d0c08d8d1f1f':
Shrink button ripple on QS btns to 36dp
2016-03-02 20:29:15 +00:00
Jaewan Kim
59a3b5f200
Merge "PIP: Show recents again when PIP menu is closed" into nyc-dev am: 19d7eeaedf
...
am: 008d56918b
* commit '008d56918b534b7765db6fe77b16c30eb1fab3ca':
PIP: Show recents again when PIP menu is closed
2016-03-02 20:29:11 +00:00
Jason Monk
b01da9e4a2
Fix crash while editing QS
...
Bug: 27061859
Change-Id: I758bb6b881eadddca1a2e4eaae7b24319e512d14
2016-03-02 15:28:30 -05:00
Chong Zhang
a65c68cb3d
Merge "Don\'t change resize mode if AM didn\'t dock the task as requested" into nyc-dev am: 5d9de3ab6f
...
am: 20862420c2
* commit '20862420c23bab9a83d79ac5c81745e7aae24536':
Don't change resize mode if AM didn't dock the task as requested
2016-03-02 20:25:35 +00:00
Julia Reynolds
c523dc1ff9
Merge "Allow notifications to be hidden from lockscreen at a package level." into nyc-dev
2016-03-02 20:15:54 +00:00
Julia Reynolds
26fa8a54b6
Allow notifications to be hidden from lockscreen at a package level.
...
Bug: 26642033
Change-Id: I67674ea9d42ee6b5865702be5d9ab2b09b53e15f
2016-03-02 15:13:54 -05:00
Jason Monk
797b1ef39e
Merge "Shrink button ripple on QS btns to 36dp" into nyc-dev
2016-03-02 20:07:34 +00:00
Jason Monk
15e637dafd
Merge "Add edit title to QS edit" into nyc-dev
...
am: 4cabb1b91f
* commit '4cabb1b91fb32c8e07ce2649b2090518b6d2c7b9':
Add edit title to QS edit
2016-03-02 20:07:20 +00:00
Jason Monk
a2549ca8dd
Merge "Guard against monkey crash" into nyc-dev
...
am: c04cf4baec
* commit 'c04cf4baecfdfeaf82c8498203779d594c9b52a4':
Guard against monkey crash
2016-03-02 20:05:15 +00:00
Jason Monk
30014c4a57
Shrink button ripple on QS btns to 36dp
...
Bug: 27388390
Change-Id: I1efbedfdf720edf4cf5d43797da59904d91cb543
2016-03-02 14:52:27 -05:00
Jason Monk
4cabb1b91f
Merge "Add edit title to QS edit" into nyc-dev
2016-03-02 19:48:25 +00:00
Jason Monk
c04cf4baec
Merge "Guard against monkey crash" into nyc-dev
2016-03-02 19:48:01 +00:00
Jason Monk
ae5bd03831
Guard against monkey crash
...
Bug: 27448755
Change-Id: I8345a274c979bf8ca1b4041c14318dd73810f79a
2016-03-02 14:38:31 -05:00
Chris Wren
973c7ea389
resolve merge conflicts of 8b6e1c888b to master
...
Change-Id: I0fd6a92de5b0679a4b870968f0c298acdfc9eb0a
2016-03-02 14:20:10 -05:00
Jason Monk
f923db5623
Add edit title to QS edit
...
Bug: 27439419
Change-Id: I3807dc56a05b1ffafcd9b390dfdbc1da9a7ebcac
2016-03-02 14:11:14 -05:00
Jaewan Kim
008d56918b
Merge "PIP: Show recents again when PIP menu is closed" into nyc-dev
...
am: 19d7eeaedf
* commit '19d7eeaedf4c80ae1d191f201ab028adc88ac2cb':
PIP: Show recents again when PIP menu is closed
2016-03-02 18:46:55 +00:00
Chong Zhang
20862420c2
Merge "Don\'t change resize mode if AM didn\'t dock the task as requested" into nyc-dev
...
am: 5d9de3ab6f
* commit '5d9de3ab6f768c9b9d5c4fa627ce019f74370531':
Don't change resize mode if AM didn't dock the task as requested
2016-03-02 18:42:42 +00:00
Dongwon Kang
19d7eeaedf
Merge "PIP: Show recents again when PIP menu is closed" into nyc-dev
2016-03-02 18:34:10 +00:00
Chong Zhang
5d9de3ab6f
Merge "Don't change resize mode if AM didn't dock the task as requested" into nyc-dev
2016-03-02 18:30:00 +00:00
Jason Monk
e38191b91a
Merge "Fix crash from battery detail" into nyc-dev am: 8326e38bf5
...
am: 49f68ab466
* commit '49f68ab466277bf7dc1821c07017d4b978820a3a':
Fix crash from battery detail
2016-03-02 18:16:59 +00:00
Chris Wren
8b6e1c888b
Merge "add all those great comments from the other file" into nyc-dev
...
am: e83cd6147b
* commit 'e83cd6147be45afd57722e414239d2dd15e257c0':
add all those great comments from the other file
2016-03-02 18:03:08 +00:00
Jason Monk
49f68ab466
Merge "Fix crash from battery detail" into nyc-dev
...
am: 8326e38bf5
* commit '8326e38bf51de2771dab65baee9a97fb6ae7ff1d':
Fix crash from battery detail
2016-03-02 17:51:51 +00:00
Chris Wren
e83cd6147b
Merge "add all those great comments from the other file" into nyc-dev
2016-03-02 17:51:29 +00:00
Jaewan Kim
3ebc1e3f99
PIP: Show recents again when PIP menu is closed
...
Framework enforces that an app cannot go back to Recents.
So launches the Recents again for the PIP menu.
Change-Id: I7526edfe7dd38c7eb1befe6a8b2b5f4ea30aa84e
2016-03-02 09:51:07 -08:00
Jason Monk
8326e38bf5
Merge "Fix crash from battery detail" into nyc-dev
2016-03-02 17:42:27 +00:00
Jason Monk
6cb901268e
Fix crash from battery detail
...
Bug: 27417780
Change-Id: Ia63dd78a4b7b75470b57c8262bbc836180274bf5
2016-03-02 12:40:43 -05:00
Geoff Mendal
48a4eb1f81
Import translations. DO NOT MERGE
...
Change-Id: I0b50c9fa731657538936e961e3c0fa1eaa594489
Auto-generated-cl: translation import
2016-03-02 07:30:42 -08:00
Geoff Mendal
687aa42a51
Import translations. DO NOT MERGE
...
Change-Id: I7abcf9b0931efc3fb6f3e6b6ac17b22aeeb83bb6
Auto-generated-cl: translation import
2016-03-02 06:07:02 -08:00
Fyodor Kupolov
ace9577f68
Merge "Restored switchTo method" into nyc-dev am: 5dbe1f30ef
...
am: 80d150f441
* commit '80d150f44199d96e69dfd206c732763e7d4136a6':
Restored switchTo method
2016-03-02 06:54:45 +00:00
Selim Cinek
fb7e6ad69a
Fixed a bug where the notification texts wouldn\'t animate am: 049f6adfb8
...
am: bf964bb1aa
* commit 'bf964bb1aa8bdea287721a376f8b46e3b0f5e422':
Fixed a bug where the notification texts wouldn't animate
2016-03-02 06:42:11 +00:00
Fyodor Kupolov
3fa9f47147
Merge "Disable switching users if the user is in a call" into nyc-dev am: 285bec2641
...
am: cef5ba5adc
* commit 'cef5ba5adc070e31fb1a568bd8c48b5d631f1cf4':
Disable switching users if the user is in a call
2016-03-02 06:03:15 +00:00
Michael Wright
63913784e6
Merge "Show error message when pairing fails in SUW." into nyc-dev am: a75c2a7819
...
am: c0f49f7e70
* commit 'c0f49f7e70f7529453ded0d5327fe611447b4471':
Show error message when pairing fails in SUW.
2016-03-02 05:36:45 +00:00
Dianne Hackborn
6a83b65d38
Merge "Fix issue #27317952 : PendingIntent.getIntent() should be protected" into nyc-dev am: a6dcaa6f84
...
am: ced889548b
* commit 'ced889548bb371bd08236499c850adfa7e021610':
Fix issue #27317952 : PendingIntent.getIntent() should be protected
2016-03-02 05:05:49 +00:00
Fyodor Kupolov
80d150f441
Merge "Restored switchTo method" into nyc-dev
...
am: 5dbe1f30ef
* commit '5dbe1f30ef1feac24d2c8216e6bcbdbb3340e0cf':
Restored switchTo method
2016-03-02 02:49:35 +00:00
Fyodor Kupolov
caab2666bd
Restored switchTo method
...
It is current used in another branch. Restored to fix a breakage.
Change-Id: Iec98bf525b88b6b5b45bffb97a1f3e9b57c492dd
2016-03-01 18:39:27 -08:00