diff options
| author | Beth Thibodeau <ethibodeau@google.com> | 2021-06-22 18:23:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-22 18:23:54 +0000 |
| commit | 4d97f9790a531d6b262bd9942f2f4fdcc316dc84 (patch) | |
| tree | 5c70f99c0f64b553cdf08588d9838fe135752012 | |
| parent | 3ae436c2ba2c70605c668a2c5c7111a63217bdcf (diff) | |
| parent | b01c33a7881e1501331d186df699a756f142f3bf (diff) | |
| download | base-4d97f9790a531d6b262bd9942f2f4fdcc316dc84.tar.gz | |
Merge "Fix stray AOD animation" into sc-dev am: b01c33a788
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15018782
Change-Id: I7e06a1913043f60c4b5a48c5a3124be9adbf43bf
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt index 3d1b4fbde56a..186f961ff1b6 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt @@ -660,15 +660,11 @@ class MediaHierarchyManager @Inject constructor( return true } - if (statusbarState == StatusBarState.KEYGUARD) { - if (currentLocation == LOCATION_LOCKSCREEN && - previousLocation == LOCATION_QS || - (currentLocation == LOCATION_QS && - previousLocation == LOCATION_LOCKSCREEN)) { - // We're always fading from lockscreen to keyguard in situations where the player - // is already fully hidden - return false - } + if (statusbarState == StatusBarState.KEYGUARD && (currentLocation == LOCATION_LOCKSCREEN || + previousLocation == LOCATION_LOCKSCREEN)) { + // We're always fading from lockscreen to keyguard in situations where the player + // is already fully hidden + return false } return mediaFrame.isShownNotFaded || animator.isRunning || animationPending } |