Bryan Eyler
4f358bc729
Merge "Use first letter of user for icons." into oc-mr1-dev am: 30f9d275e9
...
am: c9f6d38378
Change-Id: Ie1662263a220f0328fb5c21ebeb6ab16dffd4ba8
2017-08-14 17:50:47 +00:00
Bryan Eyler
30f9d275e9
Merge "Use first letter of user for icons." into oc-mr1-dev
2017-08-14 17:30:44 +00:00
Adrian Roos
d727ae0aec
Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev am: 1cbfe74fc2 am: 63953ef041
...
am: 4b559a3b69
Change-Id: I7d319fa53fddc2f5386410cda6e8f25fc01f8d1b
2017-08-12 00:48:47 +00:00
Jason Monk
d86c4d3cee
Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev am: 84626a4e3d am: 577e6bebd0
...
am: 6720da43f9
Change-Id: I93d70a5a32428912017f3643f1fe80dea48fafaa
2017-08-12 00:18:12 +00:00
Adrian Roos
63953ef041
Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev
...
am: 1cbfe74fc2
Change-Id: I6b5c4ce303455e592ecb0e6c6bfcd238fbd8a7ef
2017-08-11 23:54:50 +00:00
TreeHugger Robot
1cbfe74fc2
Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev
2017-08-11 23:43:11 +00:00
Winson Chung
8987034130
Merge "Fixing typo in swipe helper causing views not to be faded when swiped." into oc-mr1-dev am: 35ebb3c535
...
am: e1cd325bca
Change-Id: I41d36d3861edb28476ec7123d1ccb3adce3c49e7
2017-08-11 22:34:34 +00:00
Jason Monk
577e6bebd0
Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev
...
am: 84626a4e3d
Change-Id: I4c3c5be04aaa1eee409ea706b387370cedf5b15b
2017-08-11 22:29:00 +00:00
Adrian Roos
8db9311cb6
AOD: Fix navbar flicker when transitioning to AOD
...
Under certain circumstances, the transition to AOD can happen before
the navigation bar gets a chance to hide itself, which happens in a
traversal. To work around this, post turning the screen on such that
it only happens after the next traversal.
Change-Id: I178b9394e7cc6baa8e9552c9819c3ce9b044defb
Fixes: 64599221
Test: Open Whatsapp / Gmail, turn off screen, verify navbar does not flicker.
2017-08-11 14:29:35 -07:00
TreeHugger Robot
35ebb3c535
Merge "Fixing typo in swipe helper causing views not to be faded when swiped." into oc-mr1-dev
2017-08-11 20:38:01 +00:00
Beverly
4f404af606
Merge "Previous active volume dialog remains above a11y." into oc-mr1-dev am: 3e4e9e234a
...
am: b463d29a62
Change-Id: I1ceeef9d0dcdd5bd0c5607ecc76e000608c3ca5f
2017-08-11 19:59:43 +00:00
TreeHugger Robot
3e4e9e234a
Merge "Previous active volume dialog remains above a11y." into oc-mr1-dev
2017-08-11 19:19:10 +00:00
Jason Monk
d819c31050
Change default temp threshold to use shutdown temp
...
Base the temp threshold to be based on the shutdown temp lowered
by some amount to ensure the warning can be seen before a shutdown.
Test: runtest systemui
Change-Id: I033a776e874d76018592954932ed5127e1b228ae
Fixes: 62845934
2017-08-11 14:44:51 -04:00
Kevin Chyn
afcc957554
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev am: 60409a9255
...
am: 4b7539e42b
Change-Id: Ib778ed967d874e3eb4ccc3645adcc5d38c08996f
2017-08-11 17:49:51 +00:00
TreeHugger Robot
60409a9255
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
2017-08-11 17:26:07 +00:00
Philipp Weiß
7aab318c96
Merge "Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS" into oc-mr1-dev
2017-08-11 15:33:05 +00:00
Tony Mak
38b0d5881c
Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev am: 106dc34fb2
...
am: 5d5d865dc8
Change-Id: If49e70eb961731a2bb5b8ecb5313fd52346612db
2017-08-11 11:04:27 +00:00
TreeHugger Robot
106dc34fb2
Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev
2017-08-11 10:42:24 +00:00
phweiss
ae76c77780
Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS
...
This fixes the bug where different dialogs can appear
over the ambient screen or the Recent Apps screen.
Bug: 63286397
Test: manual, runtest systemui
Change-Id: I86d0cdd3d30e0ea8cbdae2dc220e1f988cf6decb
(cherry picked from commit 679dc2492c )
2017-08-11 10:38:19 +00:00
Philipp Weiß
572a5618b0
Merge "Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS"
2017-08-11 10:21:51 +00:00
Winson Chung
d8a52f237c
Fixing typo in swipe helper causing views not to be faded when swiped.
...
Bug: 63516235
Test: Enable flag to fade when swiped and verify it fades
Change-Id: I49e7840d5423d018c1f88a02e8b272c80d0143a2
2017-08-10 14:28:06 -07:00
Beverly
fa4c8e7a5e
Previous active volume dialog remains above a11y.
...
When the volume dialog is unexpanded, the a11y volume
slider displays below the current active volume stream. Previously,
when adjusting a11y volume, the previous active stream's volume dialog
row goes out of view once a11y becomes the active stream.
This caused the a11y volume dialog row to display strangely.
Now, the previous active volume dialog remains above the a11y volume
dialog when adjusting a11y volume.
Change-Id: Ice09a5c52dc524956bc5acf33f27bfd4a9843400
Fixes: 64326406
Test: manual
2017-08-10 16:33:58 -04:00
Beverly
b562da526e
Merge "Low battery notification has unique sound." into oc-mr1-dev am: 9ac6be4a66
...
am: ec3481b55d
Change-Id: Ic6feb4f79f2d9a7fb3334333cf54b75e616ec548
2017-08-10 18:03:39 +00:00
TreeHugger Robot
9ac6be4a66
Merge "Low battery notification has unique sound." into oc-mr1-dev
2017-08-10 17:37:05 +00:00
phweiss
679dc2492c
Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS
...
This fixes the bug where different dialogs can appear
over the ambient screen or the Recent Apps screen.
Bug: 63286397
Test: manual, runtest systemui
Change-Id: I86d0cdd3d30e0ea8cbdae2dc220e1f988cf6decb
2017-08-10 18:06:03 +02:00
Tony Mak
57d22f6b31
Fix the strings accordingly for policy transparency dialogs
...
Bug: 64555046
Test: Built and observe the strings.
Change-Id: If0343d701dee24d392b0578131e50b9002433a9b
2017-08-10 15:11:54 +00:00
Christine Franks
cb6e53eda6
Merge "Don't lock down system user in demo mode" into oc-dr1-dev am: 4f540fe8d0 am: f3b6768601
...
am: ff264d07ca
Change-Id: I9b65b7f2e90730895e65b6a8fd76114832458540
2017-08-10 02:53:26 +00:00
Christine Franks
ff264d07ca
Merge "Don't lock down system user in demo mode" into oc-dr1-dev am: 4f540fe8d0
...
am: f3b6768601
Change-Id: I77314a70753675d94c717d62abb40b7d2b42ac11
2017-08-10 02:32:47 +00:00
Christine Franks
f3b6768601
Merge "Don't lock down system user in demo mode" into oc-dr1-dev
...
am: 4f540fe8d0
Change-Id: I1d86ea5b69fe9a8bddb29d3e8483cc6a34b3b689
2017-08-10 02:25:10 +00:00
Christine Franks
e47f682c85
Merge "Don't lock down system user in demo mode" into oc-dr1-dev
...
am: 4f540fe8d0
Change-Id: Ib4670a8e4685a9f9bd933ccba9878bd59ccb6059
2017-08-10 02:25:09 +00:00
TreeHugger Robot
4f540fe8d0
Merge "Don't lock down system user in demo mode" into oc-dr1-dev
2017-08-10 02:17:48 +00:00
Phil Weaver
dd42d9329c
Merge "Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev am: a4b5e0893f" into oc-mr1-dev am: 794d663e42
...
am: 03023d28a3
Change-Id: Iddf9666cd9f61cc54e006118cdaf51c70ce35d54
2017-08-10 01:35:52 +00:00
Phil Weaver
68cf0f4df8
Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev
...
am: a4b5e0893f
Change-Id: I125f80e800d04e7406fcd380bce2666b5b9e5a3f
2017-08-10 00:19:07 +00:00
Phil Weaver
7cf51ed889
Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev
...
am: a4b5e0893f
Change-Id: I5e79cbadd085c2ce3eacae628388ce13bdded508
2017-08-10 00:19:04 +00:00
Phil Weaver
a4b5e0893f
Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev
2017-08-10 00:13:04 +00:00
Selim Cinek
37e78d647e
Merge "Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev am: f89e462bc7 am: b364e46f43" into oc-mr1-dev-plus-aosp
...
am: 078b253454
Change-Id: I254ec238c7ce7bc12f0dc91546f84c202efe937a
2017-08-09 23:05:48 +00:00
Matthew Ng
bef237d1ed
Merge "Fixes recents from disappearing when split and restarted" into oc-mr1-dev am: f49f8f6f24
...
am: a659bb958e
Change-Id: I17aa02521a8226929fc04ccd36bf895351e10cfc
2017-08-09 21:55:35 +00:00
Jason Monk
e2c5a1ba24
Merge "Merge "Make rounded corners handle color inversion" into oc-dr1-dev am: ca91e6cecd am: 120e560bc0" into oc-mr1-dev-plus-aosp
...
am: 9a75f9600a
Change-Id: Ia43d1936f19b6e3aeb660d6f465fe2f13dfbd83f
2017-08-09 21:39:40 +00:00
Selim Cinek
b364e46f43
Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev
...
am: f89e462bc7
Change-Id: Iead3762d5064362fbc37be960d744d68b9f7b31d
2017-08-09 21:17:14 +00:00
Selim Cinek
bbd80c9f73
Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev
...
am: f89e462bc7
Change-Id: I0dcaf830f0d65171b4a114e299793d68a4da6e40
2017-08-09 21:16:27 +00:00
TreeHugger Robot
f89e462bc7
Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev
2017-08-09 21:03:15 +00:00
Beverly
334bc5fc77
Low battery notification has unique sound.
...
Change-Id: I51c8e099da04d4bf1a55d081c9fce7fc8fb90bd1
Fixes: 63853037
Test: runtest systemui
2017-08-09 16:57:28 -04:00
TreeHugger Robot
f49f8f6f24
Merge "Fixes recents from disappearing when split and restarted" into oc-mr1-dev
2017-08-09 20:52:13 +00:00
Jason Monk
120e560bc0
Merge "Make rounded corners handle color inversion" into oc-dr1-dev
...
am: ca91e6cecd
Change-Id: I9d701444957cae9395f23537df63a76498ede87b
2017-08-09 20:45:50 +00:00
Jason Monk
dafbdf9feb
Merge "Make rounded corners handle color inversion" into oc-dr1-dev
...
am: ca91e6cecd
Change-Id: I6a5a75c63bcae98aa928667672dd52b631e85d8a
2017-08-09 20:45:45 +00:00
TreeHugger Robot
ca91e6cecd
Merge "Make rounded corners handle color inversion" into oc-dr1-dev
2017-08-09 20:38:49 +00:00
Kevin Chyn
4dc098aed1
Reset fingerprint lockout upon successful unlock
...
FingerprintSettings should not start listening for fingerprints until
after Pin/Pattern/Pass is entered
Fixes: 63437524
Fixes: 63739006
Test: open FP settings, touch an invalid finger 5 times
close FP settings, re-enter FP settings, enter Pin/Pattern/Pass
touch FP with valid finger, should not be in lockout mode
Change-Id: I9b322248b30f3c4f49414e5bc0693f03a8f2dbe4
2017-08-09 12:48:27 -07:00
Winson Chung
10754037b4
Merge changes I52152223,I49db5cab into oc-dr1-dev am: fc596b1cf6 am: d05ac9caf2
...
am: 85de81bba1
Change-Id: I26ce104b9ddb621bf6830e331acff3b5c017b1ee
2017-08-09 19:34:45 +00:00
Winson Chung
51d7ff2f38
Merge changes I52152223,I49db5cab into oc-dr1-dev
...
am: fc596b1cf6
Change-Id: I63cbca0986438b350cecf0f2c1c5b0ec2f88cebf
2017-08-09 19:01:53 +00:00
Winson Chung
d05ac9caf2
Merge changes I52152223,I49db5cab into oc-dr1-dev
...
am: fc596b1cf6
Change-Id: I53f12c1d0854d56ad0e700bf028fd68b47917e1f
2017-08-09 19:01:50 +00:00