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

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

Merge "Revert "Hide LightRevealScrim when pulsing"" into sc-dev am: 01aedfcd am: 1874e9ce 

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

Change-Id: Iad79065d62bd16a96c95612c86af6ba8293eed28
parents 97ad0a10 1874e9ce

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

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

            mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);

        }

        updateLightRevealScrimVisibility();

        Trace.endSection();

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

        }



        if (mDozeServiceHost.isPulsing()) {

            mLightRevealScrim.setVisibility(View.GONE);

            return;

        }



        if (mFeatureFlags.useNewLockscreenAnimations()

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

            mLightRevealScrim.setVisibility(View.VISIBLE);