Commit Graph

23543 Commits

Author SHA1 Message Date
Qingxi Li
9c6cf66740 Merge "Merge "Fix problems of SIM lock screen of eSIM" into oc-mr1-dev am: e8d01e269b" into oc-mr1-dev-plus-aosp
am: 0f69a41103

Change-Id: Ic2ed814a6d39435b4d430d2f9f9122d7ed0253aa
2017-08-17 02:03:18 +00:00
Bryan Eyler
60ee6b7ebd Merge "Add the margin between user pods." into oc-mr1-dev am: 060a9d1021
am: 5b78ec177a

Change-Id: I65b12ffb37759da9c84c65ac84051875bb6d3add
2017-08-17 01:24:40 +00:00
Qingxi Li
36df0e96f5 Merge "Fix problems of SIM lock screen of eSIM" into oc-mr1-dev
am: e8d01e269b

Change-Id: Id87f4ba6162cc1e0a60d13004e3adf586c8f5819
2017-08-16 21:29:04 +00:00
Qingxi Li
e8d01e269b Merge "Fix problems of SIM lock screen of eSIM" into oc-mr1-dev 2017-08-16 21:07:04 +00:00
Jason Monk
3f7868cc8e Merge "Merge "Protect against weak pointer crash." into oc-mr1-dev am: 0480580696" into oc-mr1-dev-plus-aosp
am: 67d205c3ab

Change-Id: I7989438ced94e356ed355461d03192ef668cd9a8
2017-08-16 20:40:40 +00:00
Bryan Eyler
5b78ec177a Merge "Add the margin between user pods." into oc-mr1-dev
am: 060a9d1021

Change-Id: Ia0401b8b6a81787b896b069856558d49f1df77d8
2017-08-16 20:21:50 +00:00
Bryan Eyler
060a9d1021 Merge "Add the margin between user pods." into oc-mr1-dev 2017-08-16 20:09:08 +00:00
Bryan Eyler
f623b5670a Add the margin between user pods.
In fullscreen user switcher, there is a margin that needs to be
accounted for between user pods.  This is not the same as the margin
that increases the size of a user pod.

Also fixes the way the layout is done so that it handles long user
names properly with ellipsis.

Bug: 36454400
Tested on Mojave

Change-Id: Idb3468f6a8c3f1b81a96c5ff73ff1d32c48e2c82
2017-08-16 20:08:06 +00:00
Adrian Roos
08e94e294c Merge "FingerprintController: Make sure to reset the fingerprint mode when going to sleep" into oc-mr1-dev am: b140dc40d4
am: 837282ea25

Change-Id: I45d8f4fba4328571ce9e768c7f0163f1007a1e36
2017-08-16 18:35:21 +00:00
Kevin Chyn
d01651bd9e Merge "Add method to cancel StatusBar touch" into oc-mr1-dev am: d180d76305
am: a69bdd0a57

Change-Id: I26e40e49003c377de18df68d3da014cb173ccd69
2017-08-16 18:16:07 +00:00
Matthew Ng
05cb28a48e Merge "Fixes quick switch animations for low end devices" into oc-mr1-dev am: 0877b99aaf
am: c9e95c66f4

Change-Id: I771ab6487432bce908a2d511249eacf2ea5b2002
2017-08-16 17:38:19 +00:00
Jason Monk
1bf3ea176f Merge "Protect against weak pointer crash." into oc-mr1-dev
am: 0480580696

Change-Id: I2efed3ec7096c23bc486d44b5303e24716b31fb7
2017-08-16 17:35:30 +00:00
TreeHugger Robot
0480580696 Merge "Protect against weak pointer crash." into oc-mr1-dev 2017-08-16 16:29:03 +00:00
TreeHugger Robot
6d995219d9 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-08-16 15:01:35 +00:00
Adrian Roos
837282ea25 Merge "FingerprintController: Make sure to reset the fingerprint mode when going to sleep" into oc-mr1-dev
am: b140dc40d4

Change-Id: I6b72e669dfbf87909d8ec0795aa9321e7cf9787b
2017-08-16 12:08:06 +00:00
Adrian Roos
ba7ca590af FingerprintController: Make sure to reset the fingerprint mode when going to sleep
Fixes an issue where the fingerprint controller could be stuck indefinitely, causing
the status bar to be in the SHADE state instead of the KEYGUARD state.
Now reset when going to sleep.

Also adds logging.

May also fix a second bug where the scrims were stuck in a bad state.

Change-Id: I55d456c5d157f92758267f684de2bd216ef07d94
Fixes: 64598807
Bug: 64594986
Test: mp sysuig; unlock with fingerprint; verify transition still works
2017-08-16 09:25:01 +00:00
Kevin Chyn
a69bdd0a57 Merge "Add method to cancel StatusBar touch" into oc-mr1-dev
am: d180d76305

Change-Id: I90a1f8c87a7042f96d30c0ebc1017ef953be31d1
2017-08-16 07:55:52 +00:00
TreeHugger Robot
d180d76305 Merge "Add method to cancel StatusBar touch" into oc-mr1-dev 2017-08-16 07:48:43 +00:00
Matthew Ng
c9e95c66f4 Merge "Fixes quick switch animations for low end devices" into oc-mr1-dev
am: 0877b99aaf

Change-Id: Icdfd18fb09263267daef0d0c6e8ea7d6fad5dec1
2017-08-16 02:33:30 +00:00
TreeHugger Robot
0877b99aaf Merge "Fixes quick switch animations for low end devices" into oc-mr1-dev 2017-08-16 02:28:52 +00:00
Bill Yi
bc91607e15 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I8b6189c6e7048899552af6c17be6c429c4a086de
2017-08-15 17:40:24 -07:00
Kevin Chyn
637323131a Add method to cancel StatusBar touch
Fixes: 64611899

Test: manual
Change-Id: I80f458f0365d9634c5f360793def6f673777473c
2017-08-15 16:54:03 -07:00
Lucas Dupin
450dd5baf3 Merge "Merge "Fix broken test" into oc-mr1-dev am: d8e7cb4b47" into oc-mr1-dev-plus-aosp
am: 7d19cf933d

Change-Id: I2321cc45dfbfc512658fe9906a3a65e67fd9c165
2017-08-15 22:57:25 +00:00
Lucas Dupin
bbfbbec750 Merge "Fix broken test" into oc-mr1-dev
am: d8e7cb4b47

Change-Id: I92585de3b345b60bc0f043c512e034cc428c05d1
2017-08-15 22:22:24 +00:00
TreeHugger Robot
d8e7cb4b47 Merge "Fix broken test" into oc-mr1-dev 2017-08-15 22:04:58 +00:00
Matthew Ng
c57b7f6e96 Fixes quick switch animations for low end devices
Currently using quick switch is fine but sometimes with animation
glitches but very reproducible if tapping recents button very fast. The
problem is that low end device Recents entrance animation also has the
previous tasks animating downward causing more chances of animation
instability.

The problem is that transition is not finished and it is already
starting to do the next toggled animation. When the transition from
app to recents (RecentsImpl.toggleRecents) starts without finishing
RecentsActivity.onStop, the previous frame will be visible for a couple
of frames before the entrance animation starts (having the previous task
animate down). Therefore restrict toggling to after
RecentsActivity.onStop would allow the previous frame to finish and the
transitions run normally.

Bug: 62251652
Fixes: 64401391
Test: manual - using gobo device, launch multiple apps, rapidly tap recents
button
Change-Id: I4e70434bca3c9bec287fa30559b23a1e71b5ef20
2017-08-15 14:59:43 -07:00
Annie Chin
033c29a3b7 Merge "Merge "Remove ButtonInterface.setCarMode()" into oc-mr1-dev am: 3512953d27" into oc-mr1-dev-plus-aosp
am: e22c929e85

Change-Id: I38fa21c27e779ecdafb53124ce4c97e5d030ad7a
2017-08-15 21:47:02 +00:00
Jason Monk
5661e97510 Merge "Persist docked state so it doesn't get lost in re-inflates" into oc-mr1-dev am: c611e97f29
am: b1db79db96

Change-Id: I2c900104e46a9a9c23a1faca89806f02924de7ec
2017-08-15 21:31:59 +00:00
Annie Chin
0ed85ddc73 Merge "Remove ButtonInterface.setCarMode()" into oc-mr1-dev
am: 3512953d27

Change-Id: Ie91b538a76c563744b6060425746decb415ae14c
2017-08-15 21:30:14 +00:00
Jason Monk
b1db79db96 Merge "Persist docked state so it doesn't get lost in re-inflates" into oc-mr1-dev
am: c611e97f29

Change-Id: I3bd17c3e7f34b1c9453d5cae265477429b812630
2017-08-15 21:14:46 +00:00
TreeHugger Robot
3512953d27 Merge "Remove ButtonInterface.setCarMode()" into oc-mr1-dev 2017-08-15 21:08:17 +00:00
TreeHugger Robot
c611e97f29 Merge "Persist docked state so it doesn't get lost in re-inflates" into oc-mr1-dev 2017-08-15 20:48:09 +00:00
Winson Chung
8e18ca5c79 Merge "Workaround the IME dismissing when dragging PiP." into oc-mr1-dev am: f2f9951e92
am: 8d3f4737a0

Change-Id: I706f384589dee583dc4b857efbb5db254c2e7c32
2017-08-15 20:19:41 +00:00
Winson Chung
8d3f4737a0 Merge "Workaround the IME dismissing when dragging PiP." into oc-mr1-dev
am: f2f9951e92

Change-Id: I7bb267af135004889d3579bb25cc2111150dcb76
2017-08-15 20:03:20 +00:00
Kevin Chyn
2356e49741 Merge "Only auth via FP when device is locked, when Assistant is on top" into oc-mr1-dev am: 990d25bda0
am: b79536e0a7

Change-Id: I9e60b61c5141f4e58dbed3a1c7f450f7932acf9f
2017-08-15 19:49:36 +00:00
Winson Chung
f2f9951e92 Merge "Workaround the IME dismissing when dragging PiP." into oc-mr1-dev 2017-08-15 19:49:10 +00:00
Kevin Chyn
b79536e0a7 Merge "Only auth via FP when device is locked, when Assistant is on top" into oc-mr1-dev
am: 990d25bda0

Change-Id: Iffeee7386623128a4228cb8efc1d6fe5af19e865
2017-08-15 19:29:52 +00:00
TreeHugger Robot
990d25bda0 Merge "Only auth via FP when device is locked, when Assistant is on top" into oc-mr1-dev 2017-08-15 19:15:43 +00:00
Jason Monk
2435d22db5 Merge "Manuall set accessibility order of zen radio grouping" into oc-mr1-dev am: bcf01e7a2a
am: 056975f469

Change-Id: Iada291156b91fb8cfd64473bff2010fb8c0f31a0
2017-08-15 18:59:07 +00:00
Annie Chin
98cdafb191 Remove ButtonInterface.setCarMode()
Bug: 63444779
Test: Android Auto still functions
Change-Id: If27641aedcd05ebc834c9dc0b38d18cd20ddae03
2017-08-15 11:32:08 -07:00
Jason Monk
0f5d402c1e Protect against weak pointer crash.
Because assuming GC won't run within any period of time is not a
valid testing strategy.

Test: runtest systemui
Change-Id: Id29ab777a70ca27b6ca33bd2a44cfb4c38f0fd09
Fixes: 64581449
2017-08-15 14:29:49 -04:00
Lucas Dupin
143c678bb5 Fix broken test
Change-Id: Iee80b8ec552f960dac08bfa062c128337eb22eff
Fixes: 64715967
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
2017-08-15 11:28:23 -07:00
Jason Monk
056975f469 Merge "Manuall set accessibility order of zen radio grouping" into oc-mr1-dev
am: bcf01e7a2a

Change-Id: I82f92d68ab5f864693452262b43547f55d0d2ca4
2017-08-15 18:14:42 +00:00
TreeHugger Robot
bcf01e7a2a Merge "Manuall set accessibility order of zen radio grouping" into oc-mr1-dev 2017-08-15 17:50:49 +00:00
Jason Monk
931411e326 Merge "Fix race condition crash" into oc-mr1-dev am: 8170ea1b3c
am: f15a9b984a

Change-Id: I0720e0244e40db6fa42a6f885d21279a7eb90cd7
2017-08-15 17:32:20 +00:00
Jason Monk
f15a9b984a Merge "Fix race condition crash" into oc-mr1-dev
am: 8170ea1b3c

Change-Id: I8eb6e8ce288bb3ea2930459717486fc24702060d
2017-08-15 17:04:27 +00:00
TreeHugger Robot
8170ea1b3c Merge "Fix race condition crash" into oc-mr1-dev 2017-08-15 16:43:24 +00:00
Winson Chung
eb280ca18a Merge "Add fallback to reset the waiting for transition state." into oc-dr1-dev am: 684b056531 am: 8a661ee248
am: dd4a03a53b

Change-Id: I0dad59573050cba4ee98bf5d15a7c85931b9199f
2017-08-15 16:42:33 +00:00
Winson Chung
dd4a03a53b Merge "Add fallback to reset the waiting for transition state." into oc-dr1-dev am: 684b056531
am: 8a661ee248

Change-Id: I5b8f59e5d55914960545dbc55b9087a4410f8987
2017-08-15 16:22:47 +00:00
Winson Chung
73e3d9f58c Merge "Add fallback to reset the waiting for transition state." into oc-dr1-dev
am: 684b056531

Change-Id: I77816bf56dedac6127301dc7ffd1f1de3e91031d
2017-08-15 16:12:42 +00:00