commit f7ae44258fdcb452119936dff449c2d99fd8ece8
author John Spurlock <jspurlock@google.com> Fri Aug 01 12:45:18 2014 -0400
committer John Spurlock <jspurlock@google.com> Fri Aug 01 12:45:18 2014 -0400
tree ac8a8016812f323e39e50b1ac35d1f60f91dd1e2
parent c1d48a5b7174a8599b1a9f34e47635cab83e036c

QS: Back button closes detail (if showing)

Bug:16649931
Change-Id: I9748a0793e6a71d833f7c7f884c189e16cccb8f9

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index c46f77a..4f9d4a3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -1424,6 +1424,14 @@
         return mQsExpanded;
     }
 
+    public boolean isQsDetailShowing() {
+        return mQsPanel.isShowingDetail();
+    }
+
+    public void closeQsDetail() {
+        mQsPanel.closeDetail();
+    }
+
     @Override
     public boolean shouldDelayChildPressedState() {
         return true;

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 ee29ad4..06c7be2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -3458,7 +3458,11 @@
             return true;
         }
         if (mNotificationPanel.isQsExpanded()) {
-            mNotificationPanel.animateCloseQs();
+            if (mNotificationPanel.isQsDetailShowing()) {
+                mNotificationPanel.closeQsDetail();
+            } else {
+                mNotificationPanel.animateCloseQs();
+            }
             return true;
         }
         if (mState != StatusBarState.KEYGUARD && mState != StatusBarState.SHADE_LOCKED) {