From 61b350cca6434844d9e0008f8e55fcb7a3dd92d1 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Fri, 5 Aug 2016 14:26:51 -0700 Subject: [PATCH] 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 --- .../com/android/systemui/statusbar/phone/PhoneStatusBar.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 516de4603af5d..9534a81400469 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 @@ 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(); } }