Selim Cinek
df72e80b03
Merge "Fixed a bug with public notifications" into nyc-dev am: 5a25783d33
...
am: 3b07c7f5e6
* commit '3b07c7f5e6d8fb58f18705b6af415e9a005bf40d':
Fixed a bug with public notifications
2016-02-23 01:33:53 +00:00
Selim Cinek
5ef30d5b0c
Merge "Fixed a bug where the dozemode was incorrectly applied" into nyc-dev am: dd9a8017e4
...
am: 8f03754ad4
* commit '8f03754ad42419d7f8e888c4cf4c8f415dce6e25':
Fixed a bug where the dozemode was incorrectly applied
2016-02-23 01:32:08 +00:00
Selim Cinek
3b07c7f5e6
Merge "Fixed a bug with public notifications" into nyc-dev
...
am: 5a25783d33
* commit '5a25783d3314a059c2b448b34e41aafcc78bbb10':
Fixed a bug with public notifications
2016-02-23 01:11:32 +00:00
Selim Cinek
8f03754ad4
Merge "Fixed a bug where the dozemode was incorrectly applied" into nyc-dev
...
am: dd9a8017e4
* commit 'dd9a8017e4934007fc5338e2c68b199cd6220001':
Fixed a bug where the dozemode was incorrectly applied
2016-02-23 01:09:06 +00:00
Selim Cinek
e4c068d258
Fixed a bug with public notifications
...
Public notification titles were incorrectly modified when
the notification wasn't autoredacted (i.e screenshot).
This also lead to the doze mode not working correctly anymore
as notifications were colored.
Bug: 24866646
Change-Id: I3d4cdb0e13cfbf3fb8082b930936260d7c4749af
2016-02-22 15:57:01 -08:00
Selim Cinek
0934bd9942
Fixed a bug where the dozemode was incorrectly applied
...
This could lead to invisible white text.
Bug: 27147160
Change-Id: I1196c251c795a7e271545405fb3936bcbb84cb19
2016-02-22 15:57:00 -08:00
Jason Monk
9e584392ae
Merge "Fix crash on QS edit immediate collapse" into nyc-dev am: 15e124f2df
...
am: 6df861e53c
* commit '6df861e53c585bd60b314b1322b0e919f22c7dc5':
Fix crash on QS edit immediate collapse
2016-02-22 21:29:15 +00:00
Youngsang Cho
3d1265bda7
Merge "PIP: Rename closeInternal to closePipInternal" into nyc-dev am: ffd4c73a29
...
am: ad5dccf123
* commit 'ad5dccf123d20ad56c40641fe71a49e322db90f6':
PIP: Rename closeInternal to closePipInternal
2016-02-22 21:08:54 +00:00
Jason Monk
6df861e53c
Merge "Fix crash on QS edit immediate collapse" into nyc-dev
...
am: 15e124f2df
* commit '15e124f2df93e3d6825cf2c7b2dd2c32dafa2a57':
Fix crash on QS edit immediate collapse
2016-02-22 20:42:24 +00:00
Jason Monk
15e124f2df
Merge "Fix crash on QS edit immediate collapse" into nyc-dev
2016-02-22 20:34:27 +00:00
Jason Monk
77a2c5f56b
Fix crash on QS edit immediate collapse
...
Bug: 27164002
Change-Id: Idd47716c08987eba14826c7b1f428c3231f9fdbd
2016-02-22 15:18:36 -05:00
Toni Barzic
8508ed5044
Properly handle non split system user when showing bouncer
...
am: b799d3f127
* commit 'b799d3f127f7410e8d0afe16343032e6115750fc':
Properly handle non split system user when showing bouncer
2016-02-22 20:14:04 +00:00
Toni Barzic
53ff8e5573
Merge "Try to dismiss Keyguard bypassing bouncer only for active users" into nyc-dev
...
am: a2ab1d6932
* commit 'a2ab1d6932a7135fc1696fcc8a623fc26eef0c18':
Try to dismiss Keyguard bypassing bouncer only for active users
2016-02-22 20:11:51 +00:00
Youngsang Cho
ad5dccf123
Merge "PIP: Rename closeInternal to closePipInternal" into nyc-dev
...
am: ffd4c73a29
* commit 'ffd4c73a293ebac22efa644db99ba907f9776604':
PIP: Rename closeInternal to closePipInternal
2016-02-22 20:07:47 +00:00
Youngsang Cho
8730d4a9f8
Merge "Close PIP when PIP activity is finished" into nyc-dev am: d78bf970ca
...
am: ab4848ccf5
* commit 'ab4848ccf5074709ba41ea1da3c69ee9d83a9266':
Close PIP when PIP activity is finished
2016-02-22 19:51:49 +00:00
Mady Mellor
1bae382eae
Merge "Fix crash when clearing all notifications" into nyc-dev am: e03688068f
...
am: 70a43269b3
* commit '70a43269b30f6e0ce8ec92ab99d63ef46a4d5a02':
Fix crash when clearing all notifications
2016-02-22 19:48:47 +00:00
Youngsang Cho
ab4848ccf5
Merge "Close PIP when PIP activity is finished" into nyc-dev
...
am: d78bf970ca
* commit 'd78bf970ca8b7a48bf26651016c034b5e319456c':
Close PIP when PIP activity is finished
2016-02-22 19:40:29 +00:00
Mady Mellor
70a43269b3
Merge "Fix crash when clearing all notifications" into nyc-dev
...
am: e03688068f
* commit 'e03688068f320d0401ba2dc5e10c85fc6d2affaa':
Fix crash when clearing all notifications
2016-02-22 19:36:40 +00:00
Toni Barzic
b799d3f127
Properly handle non split system user when showing bouncer
...
For system user, there should be no atempt to dismiss keyguard,
but only if system user is split (i.e. not a meat user).
Change-Id: Ia2c1e7a3e197c5be72446f21b3883e853485ff26
(cherry picked from commit aa401afb4c )
2016-02-22 19:32:15 +00:00
Toni Barzic
a2ab1d6932
Merge "Try to dismiss Keyguard bypassing bouncer only for active users" into nyc-dev
2016-02-22 19:31:52 +00:00
Youngsang Cho
ffd4c73a29
Merge "PIP: Rename closeInternal to closePipInternal" into nyc-dev
2016-02-22 19:22:32 +00:00
Youngsang Cho
336007ba71
PIP: Rename closeInternal to closePipInternal
...
Change-Id: I6e1e98a1a75728d057a7dee3edbd2f2a6f32112d
2016-02-22 11:17:29 -08:00
Youngsang Cho
d78bf970ca
Merge "Close PIP when PIP activity is finished" into nyc-dev
2016-02-22 19:04:29 +00:00
Youngsang Cho
23df699451
Close PIP when PIP activity is finished
...
Bug: 26717072
Change-Id: I5dd431b0ee64ca152bd49013bb6bbb3e8d9fba71
2016-02-22 11:03:00 -08:00
Mady Mellor
e03688068f
Merge "Fix crash when clearing all notifications" into nyc-dev
2016-02-22 18:54:40 +00:00
Mady Mellor
3cb40246f1
Fix crash when clearing all notifications
...
Bug: 27284789
2016-02-22 10:43:35 -08:00
Toni Barzic
657f88516a
Try to dismiss Keyguard bypassing bouncer only for active users
...
Some bouncers might allow showing keyguards for users that are not
currently active (e.g. before any user is signed in, in which case the
system user is active). Make sure that keyguard is not dismissed
without showing bouncer in these cases.
Change-Id: I0e037b2d4e095d49c1f0d06a9fe1b9a6233421b0
(cherry picked from commit aa69fd417f )
2016-02-22 18:39:22 +00:00
Xiaohui Chen
f89c495c2c
Merge "sysui: refactor for extensibility" into nyc-dev am: de1eaab7f7
...
am: 1c0f53e874
* commit '1c0f53e874fc66c8f96152b2cd8e5a1377fb9034':
sysui: refactor for extensibility
2016-02-22 18:30:03 +00:00
Xiaohui Chen
1c0f53e874
Merge "sysui: refactor for extensibility" into nyc-dev
...
am: de1eaab7f7
* commit 'de1eaab7f71a7bafd46e67fad2d591743061b5b8':
sysui: refactor for extensibility
2016-02-22 18:22:45 +00:00
Xiaohui Chen
5da713599f
sysui: refactor for extensibility
...
Bug: 27098035
Change-Id: I9ce480a5995f354ad45b6f13112cfa1ab49934cd
2016-02-22 18:07:42 +00:00
Geoff Mendal
687ccbbf71
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-02-22 15:29:59 +00:00
Geoff Mendal
bf0dabe274
Import translations. DO NOT MERGE
...
Change-Id: Ibf2edd0cc4c1d2d8f11d5ee489e6e9729d2d2b5e
Auto-generated-cl: translation import
2016-02-22 07:28:16 -08:00
Jason Monk
60da854e46
Merge "Move background data notif to data saver status icon" into nyc-dev am: c6b5dd4897
...
am: 487ed88b63
* commit '487ed88b634d3e43f8eccd2647b0aea54052c661':
Move background data notif to data saver status icon
2016-02-22 15:12:30 +00:00
Jason Monk
487ed88b63
Merge "Move background data notif to data saver status icon" into nyc-dev
...
am: c6b5dd4897
* commit 'c6b5dd4897bf95967b27b36cb517f0f209290be2':
Move background data notif to data saver status icon
2016-02-22 15:06:43 +00:00
Jason Monk
f23aa99270
Move background data notif to data saver status icon
...
Bug: 26796370
Change-Id: Ibf53c3affa63100b603e362b58ca6d2958791321
2016-02-22 14:56:05 +00:00
Geoff Mendal
9daee8298b
Import translations. DO NOT MERGE
...
Change-Id: I84d35f9d88f70093a3bb48f54ea4df5a1b7e7cce
Auto-generated-cl: translation import
2016-02-22 06:03:43 -08:00
Jason Monk
7cdea0389f
Fix edit/page indicator area layout am: 855d408e17
...
am: 353c8ceb04
* commit '353c8ceb042c1b8024fd1177311462c920ea0270':
Fix edit/page indicator area layout
2016-02-21 16:12:06 +00:00
Jason Monk
353c8ceb04
Fix edit/page indicator area layout
...
am: 855d408e17
* commit '855d408e17612beadfc637496f50b03a7149515a':
Fix edit/page indicator area layout
2016-02-21 16:05:41 +00:00
Jason Monk
855d408e17
Fix edit/page indicator area layout
...
Bug: 27201532
Change-Id: Ie03e6aeeb9d607f1fba370a4f1bd23a2ffb9b485
2016-02-21 11:00:49 -05:00
Jason Monk
278dafc535
Don\'t set the text on QS Tiles unless we need to am: 7435155432
...
am: b619efd771
* commit 'b619efd771bdf3525bc75ab6518af081f2d0a625':
Don't set the text on QS Tiles unless we need to
2016-02-20 18:42:09 +00:00
Jason Monk
4317ecb8f0
Merge changes Icb8e2097,I9a2a16f9 into nyc-dev am: 865a4ee0cd
...
am: 4472d715c7
* commit '4472d715c7307149e40e30370e57c3ca68beac5e':
Optimization for TouchAnimator
QS Animations - first pass, still not spec
2016-02-20 18:41:03 +00:00
Jason Monk
b619efd771
Don\'t set the text on QS Tiles unless we need to
...
am: 7435155432
* commit '74351554328e56fdd02eb09d93a98aaf97ccce04':
Don't set the text on QS Tiles unless we need to
2016-02-20 18:37:12 +00:00
Jason Monk
4472d715c7
Merge changes Icb8e2097,I9a2a16f9 into nyc-dev
...
am: 865a4ee0cd
* commit '865a4ee0cddedc8ef11f8370390e197e9ae95067':
Optimization for TouchAnimator
QS Animations - first pass, still not spec
2016-02-20 18:36:05 +00:00
Jason Monk
7435155432
Don't set the text on QS Tiles unless we need to
...
Avoid causing layout passes.
Bug: 27278616
Change-Id: I5104a756b44154f6b66f2c74aee17caf29acf628
2016-02-20 16:56:07 +00:00
Jason Monk
865a4ee0cd
Merge changes Icb8e2097,I9a2a16f9 into nyc-dev
...
* changes:
Optimization for TouchAnimator
QS Animations - first pass, still not spec
2016-02-20 16:53:04 +00:00
Jason Monk
8d1253e944
Optimization for TouchAnimator
...
Bug: 27278616
Change-Id: Icb8e20977a0f8cdbc6ace25707e8f95e34efc356
2016-02-20 16:51:41 +00:00
Jason Monk
162011ebe8
QS Animations - first pass, still not spec
...
Bug: 27201532
Change-Id: I9a2a16f9d769db1f40ae733ad55a07ede4780698
2016-02-20 08:36:40 -05:00
Jorim Jaggi
4c1ceaf163
Merge "Cancel fling animation when starting to drag" into nyc-dev am: f0c548645f
...
am: d088074eb4
* commit 'd088074eb4a4a84ce1fb04d4691f6c99b10f16c8':
Cancel fling animation when starting to drag
2016-02-20 08:17:46 +00:00
Jason Monk
f84df878f3
Merge "Fix QS Open on single finger scroll" into nyc-dev am: 11c4fd411a
...
am: aa5a2dbfb3
* commit 'aa5a2dbfb39de25fb8ed05ad8c801aaf0c2b264c':
Fix QS Open on single finger scroll
2016-02-20 07:23:13 +00:00
Jorim Jaggi
d088074eb4
Merge "Cancel fling animation when starting to drag" into nyc-dev
...
am: f0c548645f
* commit 'f0c548645fde12d26f379610e046d3b800fad38d':
Cancel fling animation when starting to drag
2016-02-20 02:32:32 +00:00