commit 61b350cca6434844d9e0008f8e55fcb7a3dd92d1
author Selim Cinek <cinek@google.com> Fri Aug 05 14:26:51 2016 -0700
committer Selim Cinek <cinek@google.com> Fri Aug 05 14:26:51 2016 -0700
tree 94ec5fec7f85aef8578dbdf6c0151eed0273d85f
parent aa3901a5ee68a7256663daa88be92a5faa267c23

Improved the transition when clicking on the last notification

In the locked shade, we were returning to the lockscreen when
the last notification was clicked and removed due to autocancel.
We're now not going back there anymore if we're closing.

Change-Id: Idc4c2c145fb2ca308f236b99408cc6096dd02302
Fixes: 30642902

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 516de46..9534a81 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -1572,7 +1572,7 @@
                     && !mNotificationPanel.isTracking() && !mNotificationPanel.isQsExpanded()) {
                 if (mState == StatusBarState.SHADE) {
                     animateCollapsePanels();
-                } else if (mState == StatusBarState.SHADE_LOCKED) {
+                } else if (mState == StatusBarState.SHADE_LOCKED && !isCollapsing()) {
                     goToKeyguard();
                 }
             }