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

Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev

Browse Source
This commit is contained in:
Lucas Dupin
2021-09-29 21:38:53 +00:00
committed by Android (Google) Code Review
parent de460d153e 540d2f3637
commit 48647682a0
3 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1264,6 +1264,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
pw.println(mDefaultScrimAlpha); pw.println(mDefaultScrimAlpha);
pw.print(" mExpansionFraction="); pw.print(" mExpansionFraction=");
pw.println(mPanelExpansion); pw.println(mPanelExpansion);
pw.print(" mExpansionAffectsAlpha=");
pw.println(mExpansionAffectsAlpha);
pw.print(" mState.getMaxLightRevealScrimAlpha="); pw.print(" mState.getMaxLightRevealScrimAlpha=");
pw.println(mState.getMaxLightRevealScrimAlpha()); pw.println(mState.getMaxLightRevealScrimAlpha());

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

@@ -4466,8 +4466,11 @@ public class StatusBar extends SystemUI implements DemoMode,
|| mKeyguardStateController.isKeyguardFadingAway(); || mKeyguardStateController.isKeyguardFadingAway();
// Do not animate the scrim expansion when triggered by the fingerprint sensor. // Do not animate the scrim expansion when triggered by the fingerprint sensor.
mScrimController.setExpansionAffectsAlpha( boolean onKeyguardOrHidingIt = mKeyguardStateController.isShowing()
!mBiometricUnlockController.isBiometricUnlock()); || mKeyguardStateController.isKeyguardFadingAway()
|| mKeyguardStateController.isKeyguardGoingAway();
mScrimController.setExpansionAffectsAlpha(!(mBiometricUnlockController.isBiometricUnlock()
&& onKeyguardOrHidingIt));
boolean launchingAffordanceWithPreview = boolean launchingAffordanceWithPreview =
mNotificationPanelViewController.isLaunchingAffordanceWithPreview(); mNotificationPanelViewController.isLaunchingAffordanceWithPreview();

28
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
View File

@@ -823,6 +823,34 @@ public class StatusBarTest extends SysuiTestCase {
verify(mScrimController).transitionTo(eq(ScrimState.UNLOCKED), any()); verify(mScrimController).transitionTo(eq(ScrimState.UNLOCKED), any());
} }
@Test
public void testSetExpansionAffectsAlpha_onlyWhenHidingKeyguard() {
mStatusBar.updateScrimController();
verify(mScrimController).setExpansionAffectsAlpha(eq(true));
clearInvocations(mScrimController);
when(mBiometricUnlockController.isBiometricUnlock()).thenReturn(true);
mStatusBar.updateScrimController();
verify(mScrimController).setExpansionAffectsAlpha(eq(true));
clearInvocations(mScrimController);
when(mKeyguardStateController.isShowing()).thenReturn(true);
mStatusBar.updateScrimController();
verify(mScrimController).setExpansionAffectsAlpha(eq(false));
clearInvocations(mScrimController);
reset(mKeyguardStateController);
when(mKeyguardStateController.isKeyguardFadingAway()).thenReturn(true);
mStatusBar.updateScrimController();
verify(mScrimController).setExpansionAffectsAlpha(eq(false));
clearInvocations(mScrimController);
reset(mKeyguardStateController);
when(mKeyguardStateController.isKeyguardGoingAway()).thenReturn(true);
mStatusBar.updateScrimController();
verify(mScrimController).setExpansionAffectsAlpha(eq(false));
}
@Test @Test
public void testTransitionLaunch_noPreview_doesntGoUnlocked() { public void testTransitionLaunch_noPreview_doesntGoUnlocked() {
mStatusBar.setBarStateForTest(StatusBarState.KEYGUARD); mStatusBar.setBarStateForTest(StatusBarState.KEYGUARD);