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

Merge "Fix issue where screen off is disabled after expanding then collapsing the shade." into sc-dev am: 3d89666385

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

Change-Id: Ie254711aef1847de3ba08a26ae167dee8f0392f7
This commit is contained in:
Josh Tsuji
2021-07-21 16:00:48 +00:00
committed by Automerger Merge Worker
parent 1023c783d8 3d89666385
commit cc8ebcaf9d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,10 +199,9 @@ class UnlockedScreenOffAnimationController @Inject constructor(
// We currently draw both the light reveal scrim, and the AOD UI, in the shade. If it's // We currently draw both the light reveal scrim, and the AOD UI, in the shade. If it's
// already expanded and showing notifications/QS, the animation looks really messy. For now, // already expanded and showing notifications/QS, the animation looks really messy. For now,
// disable it if the notification panel is expanded. // disable it if the notification panel is not fully collapsed.
if (!this::statusBar.isInitialized || if (!this::statusBar.isInitialized ||
statusBar.notificationPanelViewController.isFullyExpanded || !statusBar.notificationPanelViewController.isFullyCollapsed) {
statusBar.notificationPanelViewController.isExpanding) {
return false return false
} }