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

@@ -1572,7 +1572,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();
                 }
             }