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

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

Merge "Hide LightRevealScrim when pulsing" into sc-dev am: ee48d00b am: 20742e83 am: 9de834b1

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

Change-Id: I9d05e26dd58043156be4b2905be51cf9a4cdea41
parents 3e5d7a24 9de834b1
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -4386,6 +4386,7 @@ public class StatusBar extends SystemUI implements DemoMode,
        } else {
            mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);
        }
        updateLightRevealScrimVisibility();
        Trace.endSection();
    }

@@ -4818,6 +4819,11 @@ 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);