Improved the transition when clicking on the last notification

am: 61b350cca6 Change-Id: If43c38458af01728b37bbdc7efb16bb4f7c22682
2016-08-08 19:32:32 +00:00
parent 0314b86252 61b350cca6
commit 033987564c
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -1610,7 +1610,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
                    && !mNotificationPanel.isTracking() && !mNotificationPanel.isQsExpanded()) {
                if (mState == StatusBarState.SHADE) {
                    animateCollapsePanels();
-                } else if (mState == StatusBarState.SHADE_LOCKED) {
+                } else if (mState == StatusBarState.SHADE_LOCKED && !isCollapsing()) {
                    goToKeyguard();
                }
            }