Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "On keyguard unoccluding, set notif scrim alpha to KEYGUARD_SCRIM_ALPHA" into sc-dev am: 0f2a769d79

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15662498

Change-Id: Idb5738f197b90a92c813fba179a9e594f85d5740
This commit is contained in:
Android Build Prod User
2021-08-24 22:09:10 +00:00
committed by Automerger Merge Worker
parent b0a0874290 0f2a769d79
commit c4ff7892ab
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
View File

@@ -711,7 +711,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
} }
if (mUnOcclusionAnimationRunning && mState == ScrimState.KEYGUARD) { if (mUnOcclusionAnimationRunning && mState == ScrimState.KEYGUARD) {
// We're unoccluding the keyguard and don't want to have a bright flash. // We're unoccluding the keyguard and don't want to have a bright flash.
mNotificationsAlpha = 0f; mNotificationsAlpha = KEYGUARD_SCRIM_ALPHA;
mNotificationsTint = ScrimState.KEYGUARD.getNotifTint();
} }
} }
if (isNaN(mBehindAlpha) || isNaN(mInFrontAlpha) || isNaN(mNotificationsAlpha)) { if (isNaN(mBehindAlpha) || isNaN(mInFrontAlpha) || isNaN(mNotificationsAlpha)) {

7
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
View File

@@ -16,6 +16,7 @@
package com.android.systemui.statusbar.phone; package com.android.systemui.statusbar.phone;
import static com.android.systemui.statusbar.phone.ScrimController.KEYGUARD_SCRIM_ALPHA;
import static com.android.systemui.statusbar.phone.ScrimController.OPAQUE; import static com.android.systemui.statusbar.phone.ScrimController.OPAQUE;
import static com.android.systemui.statusbar.phone.ScrimController.SEMI_TRANSPARENT; import static com.android.systemui.statusbar.phone.ScrimController.SEMI_TRANSPARENT;
import static com.android.systemui.statusbar.phone.ScrimController.TRANSPARENT; import static com.android.systemui.statusbar.phone.ScrimController.TRANSPARENT;
@@ -1186,8 +1187,10 @@ public class ScrimControllerTest extends SysuiTestCase {
mScrimController.transitionTo(ScrimState.KEYGUARD); mScrimController.transitionTo(ScrimState.KEYGUARD);
mScrimController.setUnocclusionAnimationRunning(true); mScrimController.setUnocclusionAnimationRunning(true);
assertAlphaAfterExpansion(mNotificationsScrim, /* alpha */ 0.0f, /* expansion */ 0.0f); assertAlphaAfterExpansion(mNotificationsScrim, /* alpha */ KEYGUARD_SCRIM_ALPHA,
assertAlphaAfterExpansion(mNotificationsScrim, /* alpha */ 0.0f, /* expansion */ 1.0f); /* expansion */ 0.0f);
assertAlphaAfterExpansion(mNotificationsScrim, /* alpha */ KEYGUARD_SCRIM_ALPHA,
/* expansion */ 1.0f);
// Verify normal behavior after // Verify normal behavior after
mScrimController.setUnocclusionAnimationRunning(false); mScrimController.setUnocclusionAnimationRunning(false);