Merge "Hide LightRevealScrim when pulsing" into sc-dev

2021-05-26 17:28:42 +00:00
parent fdf919fbd5 e45e39da9e
commit ee48d00b16
1 changed files with 6 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -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);