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

Commit d74c5a8e authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Update opacity of LightRevealScrim" into sc-dev am: d91a6a07 

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

Change-Id: Icf856c3b9697b23666533b72f6ef0489d3cd6b0b
parents 3ee763ea d91a6a07

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

+3 −0
Original line number Diff line number Diff line
@@ -1246,6 +1246,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
        pw.println(mDefaultScrimAlpha);

        pw.print("  mExpansionFraction=");

        pw.println(mPanelExpansion);



        pw.print("  mState.getMaxLightRevealScrimAlpha=");

        pw.println(mState.getMaxLightRevealScrimAlpha());

    }



    public void setWallpaperSupportsAmbientMode(boolean wallpaperSupportsAmbientMode) {

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

+7 −10
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ public enum ScrimState { 
        }



        @Override

        public float getBehindAlpha() {

        public float getMaxLightRevealScrimAlpha() {

            return mWallpaperSupportsAmbientMode && !mHasBackdrop ? 0f : 1f;

        }
@@ -220,18 +220,11 @@ public enum ScrimState { 
            mBlankScreen = mDisplayRequiresBlanking;

            mAnimationDuration = mWakeLockScreenSensorActive

                    ? ScrimController.ANIMATION_DURATION_LONG : ScrimController.ANIMATION_DURATION;



            // Wake sensor will show the wallpaper, let's fade from black. Otherwise it will

            // feel like the screen is flashing if the wallpaper is light.

            if (mWakeLockScreenSensorActive && previousState == AOD) {

                updateScrimColor(mScrimBehind, 1f /* alpha */, Color.BLACK);

            }

        }



        @Override

        public float getBehindAlpha() {

        public float getMaxLightRevealScrimAlpha() {

            return mWakeLockScreenSensorActive ? ScrimController.WAKE_SENSOR_SCRIM_ALPHA

                    : AOD.getBehindAlpha();

                : AOD.getMaxLightRevealScrimAlpha();

        }

    },
@@ -351,6 +344,10 @@ public enum ScrimState { 
        return mBehindAlpha;

    }



    public float getMaxLightRevealScrimAlpha() {

        return 1f;

    }



    public float getNotifAlpha() {

        return mNotifAlpha;

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -4444,6 +4444,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
        } else {

            mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);

        }

        updateLightRevealScrimVisibility();



        Trace.endSection();

    }
@@ -4894,6 +4896,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            return;

        }



        mLightRevealScrim.setAlpha(mScrimController.getState().getMaxLightRevealScrimAlpha());

        if (mFeatureFlags.useNewLockscreenAnimations()

                && (mDozeParameters.getAlwaysOn() || mDozeParameters.isQuickPickupEnabled())) {

            mLightRevealScrim.setVisibility(View.VISIBLE);

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

+33 −13
Original line number Diff line number Diff line
@@ -312,6 +312,8 @@ public class ScrimControllerTest extends SysuiTestCase { 
                mScrimBehind, true,

                mScrimForBubble, false

        ));



        assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);

    }



    @Test
@@ -321,8 +323,9 @@ public class ScrimControllerTest extends SysuiTestCase { 


        assertScrimAlpha(Map.of(

                mScrimInFront, TRANSPARENT,

                mScrimBehind, OPAQUE,

                mScrimBehind, TRANSPARENT,

                mNotificationsScrim, TRANSPARENT));

        assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);



        assertScrimTinted(Map.of(

                mScrimInFront, true,
@@ -340,6 +343,7 @@ public class ScrimControllerTest extends SysuiTestCase { 
        assertScrimAlpha(Map.of(

                mScrimInFront, TRANSPARENT,

                mScrimBehind, TRANSPARENT));

        assertEquals(0f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);



        // Pulsing notification should conserve AOD wallpaper.

        mScrimController.transitionTo(ScrimState.PULSING);
@@ -348,6 +352,7 @@ public class ScrimControllerTest extends SysuiTestCase { 
        assertScrimAlpha(Map.of(

                mScrimInFront, TRANSPARENT,

                mScrimBehind, TRANSPARENT));

        assertEquals(0f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);

    }



    @Test
@@ -359,7 +364,8 @@ public class ScrimControllerTest extends SysuiTestCase { 


        assertScrimAlpha(Map.of(

                mScrimInFront, TRANSPARENT,

                mScrimBehind, OPAQUE));

                mScrimBehind, TRANSPARENT));

        assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);



        assertScrimTinted(Map.of(

                mScrimInFront, true,
@@ -378,7 +384,8 @@ public class ScrimControllerTest extends SysuiTestCase { 


        assertScrimAlpha(Map.of(

                mScrimInFront, TRANSPARENT,

                mScrimBehind, OPAQUE));

                mScrimBehind, TRANSPARENT));

        assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);



        assertScrimTinted(Map.of(

                mScrimInFront, true,
@@ -403,13 +410,15 @@ public class ScrimControllerTest extends SysuiTestCase { 
        finishAnimationsImmediately();

        assertScrimAlpha(Map.of(

                mScrimInFront, SEMI_TRANSPARENT,

                mScrimBehind, OPAQUE));

                mScrimBehind, TRANSPARENT));

        assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);



        // ... and that if we set it while we're in AOD, it does take immediate effect.

        mScrimController.setAodFrontScrimAlpha(1f);

        assertScrimAlpha(Map.of(

                mScrimInFront, OPAQUE,

                mScrimBehind, OPAQUE));

                mScrimBehind, TRANSPARENT));

        assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);



        // ... and make sure we recall the previous front scrim alpha even if we transition away

        // for a bit.
@@ -418,7 +427,8 @@ public class ScrimControllerTest extends SysuiTestCase { 
        finishAnimationsImmediately();

        assertScrimAlpha(Map.of(

                mScrimInFront, OPAQUE,

                mScrimBehind, OPAQUE));

                mScrimBehind, TRANSPARENT));

        assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);



        // ... and alpha updates should be completely ignored if always_on is off.

        // Passing it forward would mess up the wake-up transition.
@@ -448,23 +458,28 @@ public class ScrimControllerTest extends SysuiTestCase { 
        finishAnimationsImmediately();

        assertScrimAlpha(Map.of(

                mScrimInFront, OPAQUE,

                mScrimBehind, OPAQUE));

                mScrimBehind, TRANSPARENT));

        assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);



        // ... but will take effect after docked

        when(mDockManager.isDocked()).thenReturn(true);

        mScrimController.transitionTo(ScrimState.KEYGUARD);

        mScrimController.setAodFrontScrimAlpha(0.5f);

        mScrimController.transitionTo(ScrimState.AOD);

        finishAnimationsImmediately();



        assertScrimAlpha(Map.of(

                mScrimInFront, SEMI_TRANSPARENT,

                mScrimBehind, OPAQUE));

                mScrimBehind, TRANSPARENT));

        assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);



        // ... and that if we set it while we're in AOD, it does take immediate effect after docked.

        mScrimController.setAodFrontScrimAlpha(1f);

        finishAnimationsImmediately();

        assertScrimAlpha(Map.of(

                mScrimInFront, OPAQUE,

                mScrimBehind, OPAQUE));

                mScrimBehind, TRANSPARENT));

        assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);



        // Reset value since enums are static.

        mScrimController.setAodFrontScrimAlpha(0f);
@@ -480,7 +495,8 @@ public class ScrimControllerTest extends SysuiTestCase { 
        finishAnimationsImmediately();

        assertScrimAlpha(Map.of(

                mScrimInFront, TRANSPARENT,

                mScrimBehind, OPAQUE));

                mScrimBehind, TRANSPARENT));

        assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);



        mScrimController.transitionTo(ScrimState.PULSING);

        finishAnimationsImmediately();
@@ -489,7 +505,8 @@ public class ScrimControllerTest extends SysuiTestCase { 
        // Pulse callback should have been invoked

        assertScrimAlpha(Map.of(

                mScrimInFront, TRANSPARENT,

                mScrimBehind, OPAQUE));

                mScrimBehind, TRANSPARENT));

        assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);



        assertScrimTinted(Map.of(

                mScrimInFront, true,
@@ -503,13 +520,16 @@ public class ScrimControllerTest extends SysuiTestCase { 
        // Front scrim should be semi-transparent

        assertScrimAlpha(Map.of(

                mScrimInFront, SEMI_TRANSPARENT,

                mScrimBehind, OPAQUE));

                mScrimBehind, TRANSPARENT));

        assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);



        mScrimController.setWakeLockScreenSensorActive(true);

        finishAnimationsImmediately();

        assertScrimAlpha(Map.of(

                mScrimInFront, SEMI_TRANSPARENT,

                mScrimBehind, SEMI_TRANSPARENT));

                mScrimBehind, TRANSPARENT));

        assertEquals(ScrimController.WAKE_SENSOR_SCRIM_ALPHA,

                mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);



        // Reset value since enums are static.

        mScrimController.setAodFrontScrimAlpha(0f);