commit 22d8ff6f685c9849186ade460cf55cf5d6f4a1c4
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Oct 21 21:50:31 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 21 21:50:31 2021 +0000
tree 71aeeb25a6f51917069346e71a2f49fa65c058bc
parent e5a6127d6dbc71bafbd02d5bc534e00f6117ac1c
parent c1074125b56a9d7b5d56bde01b5bfb33a2cd4c20

Merge "StatusBar unfold transition: reset translations when rotating" into sc-v2-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationController.kt

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)
+        }
     }
 }