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

Merge "Don't call updateIsKeyguard from the UnlockedScreenOffAnimationController if we can't control the screen off animation." into sc-dev am: 5f51b92263

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15486170

Change-Id: I2cc2ba666faab889c25da664480f0e878fdcc7d2
This commit is contained in:
Josh Tsuji
2021-08-09 19:41:56 +00:00
committed by Automerger Merge Worker
parent 37d1776bad 5f51b92263
commit d52c7e3ec8
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
View File

@@ -149,14 +149,18 @@ class UnlockedScreenOffAnimationController @Inject constructor(
lightRevealAnimationPlaying = false
aodUiAnimationPlaying = false
// Make sure the status bar is in the correct keyguard state, forcing it if necessary. This
// is required if the screen off animation is cancelled, since it might be incorrectly left
// in the KEYGUARD or SHADE states depending on when it was cancelled and whether 'lock
// instantly' is enabled. We need to force it so that the state is set even if we're going
// from SHADE to SHADE or KEYGUARD to KEYGUARD, since we might have changed parts of the UI
// (such as showing AOD in the shade) without actually changing the StatusBarState. This
// ensures that the UI definitely reflects the desired state.
statusBar.updateIsKeyguard(true /* force */)
// If we can't control the screen off animation, we shouldn't mess with the StatusBar's
// keyguard state unnecessarily.
if (dozeParameters.get().canControlUnlockedScreenOff()) {
// Make sure the status bar is in the correct keyguard state, forcing it if necessary.
// This is required if the screen off animation is cancelled, since it might be
// incorrectly left in the KEYGUARD or SHADE states depending on when it was cancelled
// and whether 'lock instantly' is enabled. We need to force it so that the state is set
// even if we're going from SHADE to SHADE or KEYGUARD to KEYGUARD, since we might have
// changed parts of the UI (such as showing AOD in the shade) without actually changing
// the StatusBarState. This ensures that the UI definitely reflects the desired state.
statusBar.updateIsKeyguard(true /* force */)
}
}
override fun onStartedGoingToSleep() {