Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide LightRevealScrim when pulsing" into sc-dev

Browse Source
This commit is contained in:
Beverly Tai
2021-05-26 17:28:42 +00:00
committed by Android (Google) Code Review
parent fdf919fbd5 e45e39da9e
commit ee48d00b16
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -4386,6 +4386,7 @@ public class StatusBar extends SystemUI implements DemoMode,
} else { } else {
mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback); mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);
} }
updateLightRevealScrimVisibility();
Trace.endSection(); Trace.endSection();
} }
@@ -4818,6 +4819,11 @@ public class StatusBar extends SystemUI implements DemoMode,
return; return;
} }
if (mDozeServiceHost.isPulsing()) {
mLightRevealScrim.setVisibility(View.GONE);
return;
}
if (mFeatureFlags.useNewLockscreenAnimations() if (mFeatureFlags.useNewLockscreenAnimations()
&& (mDozeParameters.getAlwaysOn() || mDozeParameters.isQuickPickupEnabled())) { && (mDozeParameters.getAlwaysOn() || mDozeParameters.isQuickPickupEnabled())) {
mLightRevealScrim.setVisibility(View.VISIBLE); mLightRevealScrim.setVisibility(View.VISIBLE);