Commit Graph

2656 Commits

Author SHA1 Message Date
Malcolm Chen
387dc0efd1 Rename and publicize getMaxPhoneCount; and deprecate getPhoneCount.
To have better names reflecting what getPhoneCount / getMaxPhoneCount
actually represent, we replace them with getActiveModemCount and
getSupportedModemCount. As getPhoneCount is public API, we mark
it as @Deprecated.

Bug: 141388730
Test: build
Change-Id: If086c50ae803b384691f709057bceeac2fc1d9d5
Merged-In: If086c50ae803b384691f709057bceeac2fc1d9d5
2019-10-29 12:19:32 -07:00
Xiangyu/Malcolm Chen
cc2d8d495d Merge changes from topic "141388730"
am: 50c4313058

Change-Id: I0765cc4847d91a6902668756a31c7011bc5b4a54
2019-10-15 11:11:04 -07:00
Xin Li
5c4d37fc17 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Bug: 141248619
Change-Id: I078f35ceef06ae7d08c5de385fd023c71c1ecbac
2019-10-14 22:54:53 +00:00
Malcolm Chen
de64f7197a In CarrierTextController replace getPhoneCount with getMaxPhoneCount.
As first step for smooth single SIM to DSDS switch, for DSDS capable
deviced we always allocate objects as if it's in DSDS mode.

Bug: 141388730
Test: unittest and manual

Change-Id: I141689fc55063d87f4f7e5c605a461517beeabe4
Merged-In: I141689fc55063d87f4f7e5c605a461517beeabe4
2019-10-14 14:19:05 -07:00
Fabian Kozynski
941d439465 Merge "Use UnlockMethodCache#canSkipBouncer in user switcher"
am: 63e2a95b87

Change-Id: Iba7f5c6c12c1b0e5e0dd07fa9a20850428bd5674
2019-09-18 10:30:20 -07:00
Treehugger Robot
63e2a95b87 Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" 2019-09-18 17:11:28 +00:00
Joshua Tsuji
829ba3dd6c Merge "Ignore physics animation tests that have suddenly become flaky."
am: 7529e67a80

Change-Id: Ib7e2cd892d4249ad6571d52810f90b14fe1f56d4
2019-09-16 14:55:31 -07:00
Joshua Tsuji
c5fab4172a Ignore physics animation tests that have suddenly become flaky.
Test: atest SystemUITests
Change-Id: Ia15f767fdb251338a7e7b15be7836b6928e48ba5
Merged-In: Ia15f767fdb251338a7e7b15be7836b6928e48ba5
(cherry picked from commit 2b991d91c6)
2019-09-16 19:55:35 +00:00
Fabian Kozynski
7eeb7ae118 Use UnlockMethodCache#canSkipBouncer in user switcher
KeyguardMonitor#canSkipBouncer was not updated properly when the phone
was unlocked using fingerprint.

This CL removes that method and changes UserSwitcherController to query
UnlockMethodCache directly, as it was KeyguardMonitor's only client for
that method.

Test: manual unlocking with FP and with pattern
Test: no automated test yet
Bug: 140486529
Merged-In: Idbff4fbabca962c632ff5d78b25418c0502db9a7
Change-Id: Idbff4fbabca962c632ff5d78b25418c0502db9a7
2019-09-05 19:50:39 -04:00
Xin Li
f5defc19a0 DO NOT MERGE - Merge build QP1A.190711.020 into stage-aosp-master
Bug: 139893257
Change-Id: I89559c14cbc17c47f9b43754ec44904b19c73dd3
2019-08-26 18:30:47 +00:00
Xin Li
a770df1d2e DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: I94fce9c5c0b35cbb88ee27fa4cd037927964d2cd
2019-08-24 05:22:23 +00:00
Lucas Dupin
04ec6df597 Only delay bouncer if bypass is off
Test: pull up bouncer with bypass on and off
Test: atest KeyguardBouncerTest
Fixes: 137563419
Change-Id: I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc
Merged-In: I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc
(cherry picked from commit d969b76224)
2019-08-21 21:01:45 +00:00
Selim Cinek
a8010f4b5c Merge "EglDisplay may be null and cause Null point exception" into qt-r1-dev
am: aec6b61816

Change-Id: Ief335b85b37c41b128cd67727acd354c9a6642d2
2019-08-20 17:28:40 -07:00
Selim Cinek
aec6b61816 Merge "EglDisplay may be null and cause Null point exception" into qt-r1-dev 2019-08-20 23:40:41 +00:00
Dave Mankoff
a0bb6d7496 Merge "Allow for more wiggle room (literally) in BrightlineFalsingManager." into qt-r1-dev
am: 9dccbdca70

Change-Id: I2fa5aa641de7186da4bbb0b2703059a233839c54
2019-08-15 07:53:36 -07:00
Dave Mankoff
f1455b056d Allow for more wiggle room (literally) in BrightlineFalsingManager.
Bug: 138812628
Change-Id: I8590b2daff0337a395d333c07c2231cc10d236a3
Test: manual testing with different people to find better values.
2019-08-14 13:10:48 -04:00
Ned Burns
5c388cd605 Ensure isTopBucket() gets set when there is just one notification
My descendants will vilify this CL for generations to come. We'll
clean it up for R, but this is our last, best hope for fixing things
in Q.

Bug: 138775282

Test: manual
Change-Id: I615b2f7fddca30dae67dbaab0e5d54a824a4c441
Merged-In: I615b2f7fddca30dae67dbaab0e5d54a824a4c441
(cherry picked from commit 2d35980e72)
(cherry picked from commit 6c34506dd8)
2019-08-14 00:22:30 +00:00
Bill Lin
a6fe754349 EglDisplay may be null and cause Null point exception
Add null check on EglDisplay in case unexpected NPE

Fixes: 139195633
Fixes: 139113237
Test: Run Forest for CTS  x86 CtsAppTestCases on cf_x86_phone-userdebug
Test: atest com.android.systemui.glwallpaper.EglHelperTest

Change-Id: Iefb17082746bacf46b664b253a8baa8ee4b7cd68
2019-08-13 19:50:25 +08:00
Selim Cinek
7e5643525d Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev
am: 85224a5834

Change-Id: Ibf7ae797ee8f4ca739347c5b1143f080a1b86d5c
2019-08-12 16:03:05 -07:00
TreeHugger Robot
85224a5834 Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev 2019-08-12 22:44:56 +00:00
Selim Cinek
72cd9a7358 Using the keyguard fading away duration for the scrim
Previously we were using a fixed duration and as a result the
scrims duration was much shorter right after boot when the
fading away duration takes 2 seconds. We're now always using
the fading away duration which simplifies also the bypass
transition.

Fixes: 138305791
Test: atest SystemUITests
Change-Id: I2eba68c75c9777ab1ba6ffadadafed3836eb74e3
2019-08-09 18:01:27 -07:00
Ned Burns
77de201ab2 Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-r1-dev
am: 9a38205327

Change-Id: I570ce1e57c3a7a0be4cc252b144c775312703617
2019-08-09 10:52:52 -07:00
Ned Burns
2d35980e72 Ensure isTopBucket() gets set when there is just one notification
My descendants will vilify this CL for generations to come. We'll
clean it up for R, but this is our last, best hope for fixing things
in Q.

Bug: 138775282

Test: manual
Change-Id: I615b2f7fddca30dae67dbaab0e5d54a824a4c441
2019-08-08 22:16:52 -04:00
Selim Cinek
cab5f56182 Merge "Fixes breaking test" into qt-r1-dev
am: 4c1435a8eb

Change-Id: I4a40f423189241227aa11711ccca5a31d4520551
2019-08-02 11:31:00 -07:00
Fabian Kozynski
4d1fb4c6ed Merge "Fix "Invalid card" text on CarrierTextController" into qt-r1-dev
am: 96585dea65

Change-Id: I16e7aaf32f49433e9d1229412650bc44164900ff
2019-08-02 11:26:36 -07:00
Selim Cinek
4c1435a8eb Merge "Fixes breaking test" into qt-r1-dev 2019-08-02 17:58:49 +00:00
Fabian Kozynski
96585dea65 Merge "Fix "Invalid card" text on CarrierTextController" into qt-r1-dev 2019-08-02 17:48:59 +00:00
Selim Cinek
eec5884c77 Fixes breaking test
Fixes: 138812624
Test: atest SystemUiTests
Change-Id: If289ea1c2a0eaa2332d1328f3eb50acd71aaf354
2019-08-02 09:35:28 -07:00
Selim Cinek
0397465046 Merge changes from topic "dynamic_privacy_fixes" into qt-r1-dev
am: ac7423b6b6

Change-Id: Ib6d5051eea746a1e5e19ab9665f1276bb6cd31ca
2019-08-01 14:28:00 -07:00
Selim Cinek
10a572979c Avoid strange animation when dynamic privacy changes
The dynamic privacy state would briefly switch during
unlocking, leading to the view appearing even though
it was already visible.

Fixes: 	138620551
Test: enable dynamic privacy, unlock with face, then unlock by dragging down, observe no weird animation
Change-Id: I3cc0945af0b83ee18cd173545a099af45b442e56
2019-08-01 13:24:26 -07:00
Selim Cinek
5454a0dd15 Improved the experience with bypass and dynamic privacy
The user can now use the expand buttons and also clear
all is invisible while locked down.
The can also drag down normally to reveal the
contents of a notification.
Also, the section clear button is also properly updated
once dynamic privacy changes.

Fixes: 138671060
Fixes: 138669307
Test: drag down with notif hidden and bypass on on a sensitive notification
Change-Id: I8743400d0b46583802a8663f6723dfa6beee95c9
2019-08-01 13:24:23 -07:00
Lucas Dupin
c8359c5527 Merge "Switch preffered display mode on lock screen" into qt-r1-dev
am: 311e1db11d

Change-Id: Ie228bc6ab839464d46cff87f1821d18de1b31d16
2019-07-31 11:31:43 -07:00
Fabian Kozynski
c3d06f3df4 Fix "Invalid card" text on CarrierTextController
If there's an invalid sim that does not have a corresponding sub, the
text "Invalid card" should be appended to the current carrierText. As
this was assembled after this step (when it was empty), it ended up
replacing the correct carrierText instead of being appended.

Test: atest CarrierTextControllerTest
Bug: 138605164
Change-Id: Ibe0e2c3a218ea5c50f94e79cc46bd985b9646af0
2019-07-31 14:21:14 -04:00
Lucas Dupin
e25c487141 Switch preffered display mode on lock screen
To save power, now it's possible to specify a preferred refresh rate for
the lock screen. It's -1 by default, and should be configured on a
device overlay whenever required.

Test: manual
Test: atest StatusBarWindowControllerTest
Fixes: 138303350
Change-Id: I4d1ca210b50d32d937b0fea2fcb9e28a7c50c0b3
2019-07-30 09:47:18 -07:00
Selim Cinek
f50fdbbf68 Merge "Showing the notification icon properly now when the pulse is suppressed" into qt-r1-dev
am: a1001b430f

Change-Id: Id23121f6067fb8fafeb57c218673fc4e8b35fae9
2019-07-26 10:11:26 -07:00
Selim Cinek
a1001b430f Merge "Showing the notification icon properly now when the pulse is suppressed" into qt-r1-dev 2019-07-26 16:54:09 +00:00
Vinit Nayak
3606f85e71 Merge "Prevent key removal on cache update" into qt-r1-dev
am: c1dc1facea

Change-Id: Iba19e17cbd447ba045aee948c5156a10c89049ba
2019-07-26 09:26:56 -07:00
Lucas Dupin
0488e681d8 Merge "Show bouncer when unlocking and not interactive" into qt-r1-dev
am: 1905fb1468

Change-Id: I5e7d57c946345f80ee7279c65d03ed33b2d9f99d
2019-07-26 09:21:56 -07:00
Vinit Nayak
c1dc1facea Merge "Prevent key removal on cache update" into qt-r1-dev 2019-07-26 15:56:23 +00:00
Lucas Dupin
81cdfa4a82 Show bouncer when unlocking and not interactive
We cannot dismiss the bouncer when the device cannot be unlocked,
otherwise we'll be stuck looking since gatekeeper is not unlocked.

Test: face auth from AOD2 encrypted
Test: face auth from lock screen encrypted
Test: face auth from AOD2
Test: atest BiometricsUnlockControllerTest
Fixes: 138093575
Change-Id: I5c5b89ee9fa1a10cedceaf1ab227e26910beed2a
2019-07-25 22:16:26 -07:00
Selim Cinek
65c96f2fd4 Showing the notification icon properly now when the pulse is suppressed
Previously the notification would be hidden so if the user would pull
out the phone from the pocket, they might not see what notification
actually alerted.

Bug: 138336424
Test: add notification while on AOD, block prox sensor, see icon
Change-Id: I8f7bd7a6a0562942ed3e12f28705043722d177e8
2019-07-25 20:47:43 -07:00
Vinit Nayak
3a9f1f547a Prevent key removal on cache update
Recent thumbnail cache keys were prematurely
deleted from the TaskKeyCache.

Test: atest SystemUITests:TaskKeyLruCacheTest

fixes: 111077107
Change-Id: I4d38ba1f69b4a4b9898e1951b68181f27f92c116
2019-07-26 01:20:14 +00:00
Lucas Dupin
69a0103f65 Merge "Make sure scrims will fade from black" into qt-r1-dev
am: bae4081329

Change-Id: Id375f5c6462e3148c629067d86079ba802d27aeb
2019-07-24 22:08:15 -07:00
Ned Burns
4863f9be22 Fix issue with media notifs being misbucketed
Previous code assumed that "isHighPriority" == "is in top section",
which is not always true. Media notifs and some other notifs can appear
in the top section even if they're not high priority. Because we detect
section boundaries by iterating through the list until we find the first
notif where isHighPriority == false, we were sometimes drawing the
section boundary way too high. This change creates a new propery,
isInTopSection() that accurately tracks this state.

Setting this value in the proper location would require some seriously
destabilizing refactors, so instead we set it in the list comparator,
which is awful but here are.

Test: manual
Bug: 138320173
Change-Id: I19223720bac534ab92219a2962169097819e8efb
Merged-In: I19223720bac534ab92219a2962169097819e8efb
(cherry picked from commit 8c1b763dcf)
(cherry picked from commit 91e425d793)
2019-07-25 04:11:46 +00:00
Lucas Dupin
a7eacf93fd Make sure scrims will fade from black
Scrims might be light if the wallpaper is light, but when
turning on the screen, we should always fade from black,
otherwise the display will bright up before dimming down.

Test: pulse with light wallpaper and AOD on/off
Test: press power with AOD on/off
Test: atest ScrimControllerTest
Fixes: 138097741
Change-Id: Icc1ce276c839bce248ab9362a5d8cf4905201e0e
2019-07-24 23:24:12 +00:00
Ned Burns
0522cdc1f0 Merge "Fix issue with media notifs being misbucketed" into qt-r1-dev
am: dc860bdfa8

Change-Id: I9a239a1ea440895161cfa7e7154fb6042df2f9d6
2019-07-24 10:32:40 -07:00
Ned Burns
dc860bdfa8 Merge "Fix issue with media notifs being misbucketed" into qt-r1-dev 2019-07-24 16:49:14 +00:00
Selim Cinek
eb03710936 Merge "Fix breaking test" into qt-r1-dev
am: dc40ca591f

Change-Id: I17fbdab3aea1f1c6f9ab771f7e476ba87cb2b121
2019-07-23 21:43:51 -07:00
Selim Cinek
dc40ca591f Merge "Fix breaking test" into qt-r1-dev 2019-07-24 04:15:53 +00:00
Lucas Dupin
848dd31aea Merge "Bouncer isn't in transit when fully visible/hidden" into qt-r1-dev
am: c2877e1197

Change-Id: I4886a6926304f84dc32026a609f9bd5471d57235
2019-07-23 20:55:11 -07:00