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

Browse Source
This commit is contained in:
Josh Tsuji
2021-08-09 19:30:03 +00:00
committed by Android (Google) Code Review
parent 365cc28b50 18fefecab2
commit 5f51b92263
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 lightRevealAnimationPlaying = false
aodUiAnimationPlaying = false aodUiAnimationPlaying = false
// Make sure the status bar is in the correct keyguard state, forcing it if necessary. This // If we can't control the screen off animation, we shouldn't mess with the StatusBar's
// is required if the screen off animation is cancelled, since it might be incorrectly left // keyguard state unnecessarily.
// in the KEYGUARD or SHADE states depending on when it was cancelled and whether 'lock if (dozeParameters.get().canControlUnlockedScreenOff()) {
// instantly' is enabled. We need to force it so that the state is set even if we're going // Make sure the status bar is in the correct keyguard state, forcing it if necessary.
// from SHADE to SHADE or KEYGUARD to KEYGUARD, since we might have changed parts of the UI // This is required if the screen off animation is cancelled, since it might be
// (such as showing AOD in the shade) without actually changing the StatusBarState. This // incorrectly left in the KEYGUARD or SHADE states depending on when it was cancelled
// ensures that the UI definitely reflects the desired state. // and whether 'lock instantly' is enabled. We need to force it so that the state is set
statusBar.updateIsKeyguard(true /* force */) // 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() { override fun onStartedGoingToSleep() {