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

Merge "Keep QS black during auth" into tm-dev

Browse Source
This commit is contained in:
Lucas Dupin
2022-03-25 16:46:53 +00:00
committed by Android (Google) Code Review
parent 017c695c8c f56f127811
commit 67aeabd875
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -767,6 +767,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
mBehindAlpha = behindFraction * mDefaultScrimAlpha; mBehindAlpha = behindFraction * mDefaultScrimAlpha;
mNotificationsAlpha = mBehindAlpha; mNotificationsAlpha = mBehindAlpha;
if (mClipsQsScrim) {
mBehindAlpha = 1;
mBehindTint = Color.BLACK;
}
} else if (mState == ScrimState.KEYGUARD || mState == ScrimState.SHADE_LOCKED } else if (mState == ScrimState.KEYGUARD || mState == ScrimState.SHADE_LOCKED
|| mState == ScrimState.PULSING) { || mState == ScrimState.PULSING) {
Pair<Integer, Float> result = calculateBackStateForState(mState); Pair<Integer, Float> result = calculateBackStateForState(mState);

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

@@ -1107,6 +1107,7 @@ public class ScrimControllerTest extends SysuiTestCase {
// GIVEN device has an activity showing ('UNLOCKED' state can occur on the lock screen // GIVEN device has an activity showing ('UNLOCKED' state can occur on the lock screen
// with the camera app occluding the keyguard) // with the camera app occluding the keyguard)
mScrimController.transitionTo(ScrimState.UNLOCKED); mScrimController.transitionTo(ScrimState.UNLOCKED);
mScrimController.setClipsQsScrim(true);
mScrimController.setRawPanelExpansionFraction(1); mScrimController.setRawPanelExpansionFraction(1);
// notifications scrim alpha change require calling setQsPosition // notifications scrim alpha change require calling setQsPosition
mScrimController.setQsPosition(0, 300); mScrimController.setQsPosition(0, 300);
@@ -1120,6 +1121,12 @@ public class ScrimControllerTest extends SysuiTestCase {
mScrimBehind.getViewAlpha(), 1, 0.0); mScrimBehind.getViewAlpha(), 1, 0.0);
assertEquals("Notifications scrim should be opaque", assertEquals("Notifications scrim should be opaque",
mNotificationsScrim.getViewAlpha(), 1, 0.0); mNotificationsScrim.getViewAlpha(), 1, 0.0);
assertScrimTinted(Map.of(
mScrimInFront, true,
mScrimBehind, true,
mNotificationsScrim, false
));
} }
@Test @Test