diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-09-09 00:12:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-09 00:12:31 +0000 |
| commit | 975ceef616aac6de561c4a4e1d82a636f5cf37e3 (patch) | |
| tree | 92699bac9d4dd87e2d80444c49485af235840f02 | |
| parent | ad69e53e7ee3fdaaff676ae5d0e99f6b267675f9 (diff) | |
| parent | 52429b4a8b9be501f52df62e77c3e4bbb5bf0c3f (diff) | |
| download | frameworks_base-975ceef616aac6de561c4a4e1d82a636f5cf37e3.zip frameworks_base-975ceef616aac6de561c4a4e1d82a636f5cf37e3.tar.gz frameworks_base-975ceef616aac6de561c4a4e1d82a636f5cf37e3.tar.bz2 | |
am 52429b4a: Cancel animation when hiding Keyguard
* commit '52429b4a8b9be501f52df62e77c3e4bbb5bf0c3f':
Cancel animation when hiding Keyguard
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 1 |
1 files changed, 1 insertions, 0 deletions
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; } |