Merge "Revert "Hide LightRevealScrim when pulsing"" into sc-dev

2021-06-11 19:02:12 +00:00
parent 4f721d3d6b aa52df898b
commit 01aedfcdeb
1 changed files with 0 additions and 6 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -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);