commit 52429b4a8b9be501f52df62e77c3e4bbb5bf0c3f
author Jorim Jaggi <jjaggi@google.com> Thu Sep 03 19:58:19 2015 -0700
committer Jorim Jaggi <jjaggi@google.com> Wed Sep 09 00:04:23 2015 +0000
tree d3cbb15eb4451fca8e5822374edcf52c122b5df8
parent edf47486507f5edad1d1d8e6091b9a82f9e56930

Cancel animation when hiding Keyguard

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

Bug: 23692022
Change-Id: If40eb66499c95b82d86873dbbd6ccc64468373b2

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

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 @@
         mHandler.removeMessages(MSG_LAUNCH_TRANSITION_TIMEOUT);
         releaseGestureWakeLock();
         mNotificationPanel.onAffordanceLaunchEnded();
+        mNotificationPanel.animate().cancel();
         mNotificationPanel.setAlpha(1f);
         return staying;
     }