From e45e39da9e31dd49adfb5c65dd6d5adc33740002 Mon Sep 17 00:00:00 2001 From: Beverly Date: Wed, 26 May 2021 08:07:56 -0400 Subject: [PATCH] Hide LightRevealScrim when pulsing so the scrim doesn't obscure the wallpaper Test: manual Bug: 187670193 Change-Id: Iffb78118d3069b04edb840125aacffd51c52a937 --- .../src/com/android/systemui/statusbar/phone/StatusBar.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 1364d473c15dd..b981d48b67ced 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -4380,6 +4380,7 @@ public class StatusBar extends SystemUI implements DemoMode, } else { mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback); } + updateLightRevealScrimVisibility(); Trace.endSection(); } @@ -4812,6 +4813,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);