summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sherry Zhou <yuandizhou@google.com> 2023-07-24 19:59:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-24 19:59:30 +0000
commit6abb7fd6b47fb6f3f60468ac3bdf18e8c91c797f (patch)
tree88fc18f53a3a55ee61d27bae2ba75952e95933e6
parent12d8d94844dcdddb16b82f55aa4287832aa92ed3 (diff)
parentc9cef27613a10979cb4f020a2d66b28652f64037 (diff)
Fix no KeyguardStatusView on lock screen am: 22a121bf91 am: c9cef27613
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24179446 Change-Id: I0986b0c299f1e91a233b3b2b984272dcc808ad8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
index 592d1aa8f43f..135307accd13 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
@@ -182,7 +182,7 @@ class UnlockedScreenOffAnimationController @Inject constructor(
// Cancel any existing CUJs before starting the animation
interactionJankMonitor.cancel(CUJ_SCREEN_OFF_SHOW_AOD)
-
+ PropertyAnimator.cancelAnimation(keyguardView, AnimatableProperty.ALPHA)
PropertyAnimator.setProperty(
keyguardView, AnimatableProperty.ALPHA, 1f,
AnimationProperties()