From 52429b4a8b9be501f52df62e77c3e4bbb5bf0c3f Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Thu, 3 Sep 2015 19:58:19 -0700
Subject: Cancel animation when hiding Keyguard

So we don't end up in a wrong state.

Bug: 23692022
Change-Id: If40eb66499c95b82d86873dbbd6ccc64468373b2
---
 .../src/com/android/systemui/statusbar/phone/PhoneStatusBar.java         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 55b1127..ce6ea57 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -3535,6 +3535,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         mHandler.removeMessages(MSG_LAUNCH_TRANSITION_TIMEOUT);
         releaseGestureWakeLock();
         mNotificationPanel.onAffordanceLaunchEnded();
+        mNotificationPanel.animate().cancel();
         mNotificationPanel.setAlpha(1f);
         return staying;
     }
-- 
cgit v1.1