Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef35ff21 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I59138d29458b23ad980ac5a8418cc168e3c50d4d
parents 48942a0a 48647682

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -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());

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -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();

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

+28 −0
Original line number Original line Diff line number Diff line
@@ -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);