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

Merge "Update light reveal effect on wake/sleep so that the screen off animation works too." into sc-dev

Browse Source
This commit is contained in:
Josh Tsuji
2021-07-01 20:16:01 +00:00
committed by Android (Google) Code Review
parent 7ab8dd98ba 75468e1ef1
commit 71812c219c
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3896,15 +3896,6 @@ public class StatusBar extends SystemUI implements DemoMode,
updateQsExpansionEnabled(); updateQsExpansionEnabled();
mKeyguardViewMediator.setDozing(mDozing); mKeyguardViewMediator.setDozing(mDozing);
if ((isDozing && mWakefulnessLifecycle.getLastSleepReason()
== PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON)
|| (!isDozing && mWakefulnessLifecycle.getLastWakeReason()
== PowerManager.WAKE_REASON_POWER_BUTTON)) {
mLightRevealScrim.setRevealEffect(mPowerButtonReveal);
} else if (!(mLightRevealScrim.getRevealEffect() instanceof CircleReveal)) {
mLightRevealScrim.setRevealEffect(LiftReveal.INSTANCE);
}
mNotificationsController.requestNotificationUpdate("onDozingChanged"); mNotificationsController.requestNotificationUpdate("onDozingChanged");
updateDozingState(); updateDozingState();
mDozeServiceHost.updateDozing(); mDozeServiceHost.updateDozing();
@@ -3913,6 +3904,27 @@ public class StatusBar extends SystemUI implements DemoMode,
Trace.endSection(); Trace.endSection();
} }
/**
* Updates the light reveal effect to reflect the reason we're waking or sleeping (for example,
* from the power button).
* @param wakingUp Whether we're updating because we're waking up (true) or going to sleep
* (false).
*/
private void updateRevealEffect(boolean wakingUp) {
if (mLightRevealScrim == null) {
return;
}
if (wakingUp && mWakefulnessLifecycle.getLastWakeReason()
== PowerManager.WAKE_REASON_POWER_BUTTON
|| !wakingUp && mWakefulnessLifecycle.getLastSleepReason()
== PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON) {
mLightRevealScrim.setRevealEffect(mPowerButtonReveal);
} else if (!(mLightRevealScrim.getRevealEffect() instanceof CircleReveal)) {
mLightRevealScrim.setRevealEffect(LiftReveal.INSTANCE);
}
}
public LightRevealScrim getLightRevealScrim() { public LightRevealScrim getLightRevealScrim() {
return mLightRevealScrim; return mLightRevealScrim;
} }
@@ -4045,6 +4057,7 @@ public class StatusBar extends SystemUI implements DemoMode,
public void onStartedGoingToSleep() { public void onStartedGoingToSleep() {
String tag = "StatusBar#onStartedGoingToSleep"; String tag = "StatusBar#onStartedGoingToSleep";
DejankUtils.startDetectingBlockingIpcs(tag); DejankUtils.startDetectingBlockingIpcs(tag);
updateRevealEffect(false /* wakingUp */);
updateNotificationPanelTouchState(); updateNotificationPanelTouchState();
notifyHeadsUpGoingToSleep(); notifyHeadsUpGoingToSleep();
dismissVolumeDialog(); dismissVolumeDialog();
@@ -4076,6 +4089,7 @@ public class StatusBar extends SystemUI implements DemoMode,
// This is intentionally below the stopDozing call above, since it avoids that we're // This is intentionally below the stopDozing call above, since it avoids that we're
// unnecessarily animating the wakeUp transition. Animations should only be enabled // unnecessarily animating the wakeUp transition. Animations should only be enabled
// once we fully woke up. // once we fully woke up.
updateRevealEffect(true /* wakingUp */);
updateNotificationPanelTouchState(); updateNotificationPanelTouchState();
mPulseExpansionHandler.onStartedWakingUp(); mPulseExpansionHandler.onStartedWakingUp();