From e2f6173bc08a902634e5996190b94a010ff483e2 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Wed, 7 Sep 2016 15:16:22 -0700
Subject: [PATCH] KeyguardStatusBar: Fix bad state after canceled animation

Fixes a bug where the icon area and user switcher
could overlap if the animation was canceled at a
bad time.

Change-Id: I21713512fb5c70c45439258609b87a585675304a
Fixes: 30865084
---
 .../android/systemui/statusbar/phone/KeyguardStatusBarView.java  | 1 +
 1 file changed, 1 insertion(+)

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 93ed1398c2a67..41b0bb2c59ad9 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 @@ public class KeyguardStatusBarView extends RelativeLayout
         super.setVisibility(visibility);
         if (visibility != View.VISIBLE) {
             mSystemIconsSuperContainer.animate().cancel();
+            mSystemIconsSuperContainer.setTranslationX(0);
             mMultiUserSwitch.animate().cancel();
             mMultiUserSwitch.setAlpha(1f);
         } else {