summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Beverly <beverlyt@google.com> 2021-05-26 08:07:56 -0400
committer Beverly Tai <beverlyt@google.com> 2021-05-26 12:13:02 +0000
commite45e39da9e31dd49adfb5c65dd6d5adc33740002 (patch)
tree8aec73e4c20db1f135e69b35afaa8e0a1fc2d892
parent3188bdda5327aaa73a2c4e1bbbf18489d4316022 (diff)
Hide LightRevealScrim when pulsing
so the scrim doesn't obscure the wallpaper Test: manual Bug: 187670193 Change-Id: Iffb78118d3069b04edb840125aacffd51c52a937
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java6
1 files changed, 6 insertions, 0 deletions
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 1364d473c15d..b981d48b67ce 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);