commit | e7a1dd8d73ca8d6c638b708bb2b28e7f427eebd2 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Oct 21 22:03:45 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 21 22:03:45 2021 +0000 |
tree | 6cd1794fa71dc4fdbeeced6d0a1e3e1fca50f132 | |
parent | abbfd0b4c4256456622008e60ae39d775bc916f9 [diff] | |
parent | 22d8ff6f685c9849186ade460cf55cf5d6f4a1c4 [diff] |
Merge "StatusBar unfold transition: reset translations when rotating" into sc-v2-dev am: 22d8ff6f68 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16101762 Change-Id: I24b19ea689c514825745f13ad6d24ae447b44759
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationController.kt index 2707fa3..8ef186c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationController.kt
@@ -63,5 +63,11 @@ override fun onTransitionProgress(progress: Float) { moveFromCenterAnimator?.onTransitionProgress(progress) } + + override fun onTransitionFinished() { + // Reset translations when transition is stopped/cancelled + // (e.g. the transition could be cancelled mid-way when rotating the screen) + moveFromCenterAnimator?.onTransitionProgress(1f) + } } }