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

Merge "Don't animate unlocked screen off if QS is expanded" into tm-dev am: c495949e13

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

Change-Id: I67b9afd383401c5c5a0919b1f8dc1d55875132aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beverly Tai
2022-05-10 20:30:54 +00:00
committed by Automerger Merge Worker
parent 19318d6090 c495949e13
commit 4ef5d6d2ec
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,9 +311,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 not fully collapsed. // disable it if the notification panel is expanded.
if ((!this::mCentralSurfaces.isInitialized || if ((!this::mCentralSurfaces.isInitialized ||
!mCentralSurfaces.notificationPanelViewController.isFullyCollapsed) && mCentralSurfaces.notificationPanelViewController.isExpanded) &&
// Status bar might be expanded because we have started // Status bar might be expanded because we have started
// playing the animation already // playing the animation already
!isAnimationPlaying() !isAnimationPlaying()