commit 9bb3ed9750caac8c8df482b7013e1842a009c8f7
author Adrian Roos <roosa@google.com> Thu Sep 08 21:36:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 08 21:36:58 2016 +0000
tree 646aa04f331c3f36e31e9469bff3e83a82bfd475
parent e55a985010fbaa5ea10ed1eb2f2388e9269c942f
parent e2f6173bc08a902634e5996190b94a010ff483e2

KeyguardStatusBar: Fix bad state after canceled animation
am: e2f6173bc0

Change-Id: I44e0e89f4d8eed0729b1450e44e57cb53dc97d1f

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
index 93ed139..41b0bb2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
@@ -308,6 +308,7 @@
         super.setVisibility(visibility);
         if (visibility != View.VISIBLE) {
             mSystemIconsSuperContainer.animate().cancel();
+            mSystemIconsSuperContainer.setTranslationX(0);
             mMultiUserSwitch.animate().cancel();
             mMultiUserSwitch.setAlpha(1f);
         } else {