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

Merge "Bring back circle reveal from AOD" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-14 05:59:54 +00:00
committed by Android (Google) Code Review
parent a8a6a45f68 2c07791672
commit f0082ed1e1
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3521,10 +3521,10 @@ public class StatusBar extends SystemUI implements DemoMode,
public void fadeKeyguardWhilePulsing() { public void fadeKeyguardWhilePulsing() {
mNotificationPanelViewController.fadeOut(0, FADE_KEYGUARD_DURATION_PULSING, mNotificationPanelViewController.fadeOut(0, FADE_KEYGUARD_DURATION_PULSING,
()-> { ()-> {
hideKeyguard();
if (shouldShowCircleReveal()) { if (shouldShowCircleReveal()) {
startCircleReveal(); startCircleReveal();
} }
hideKeyguard();
mStatusBarKeyguardViewManager.onKeyguardFadedAway(); mStatusBarKeyguardViewManager.onKeyguardFadedAway();
}).start(); }).start();
} }
@@ -3882,9 +3882,7 @@ public class StatusBar extends SystemUI implements DemoMode,
updateQsExpansionEnabled(); updateQsExpansionEnabled();
mKeyguardViewMediator.setDozing(mDozing); mKeyguardViewMediator.setDozing(mDozing);
if (!isDozing && shouldShowCircleReveal()) { if ((isDozing && mWakefulnessLifecycle.getLastSleepReason()
startCircleReveal();
} else if ((isDozing && mWakefulnessLifecycle.getLastSleepReason()
== PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON) == PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON)
|| (!isDozing && mWakefulnessLifecycle.getLastWakeReason() || (!isDozing && mWakefulnessLifecycle.getLastWakeReason()
== PowerManager.WAKE_REASON_POWER_BUTTON)) { == PowerManager.WAKE_REASON_POWER_BUTTON)) {
@@ -4897,7 +4895,6 @@ public class StatusBar extends SystemUI implements DemoMode,
if (mFeatureFlags.useNewLockscreenAnimations() if (mFeatureFlags.useNewLockscreenAnimations()
&& (mDozeParameters.getAlwaysOn() || mDozeParameters.isQuickPickupEnabled())) { && (mDozeParameters.getAlwaysOn() || mDozeParameters.isQuickPickupEnabled())) {
mLightRevealScrim.setVisibility(View.VISIBLE); mLightRevealScrim.setVisibility(View.VISIBLE);
mLightRevealScrim.setRevealEffect(LiftReveal.INSTANCE);
} else { } else {
mLightRevealScrim.setVisibility(View.GONE); mLightRevealScrim.setVisibility(View.GONE);
} }