The whole title area of the notification panel should toggle the settings view.

Bug: 3313452
Change-Id: I8240e76367a6608849bbeb69af6ca8f206475d8d

1 files changed, 7 insertions, 6 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java
index 759c17c..3ca1e12 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java
@@ -81,11 +81,10 @@ public class NotificationPanel extends LinearLayout implements StatusBarPanel,
 
         mContentParent = (ViewGroup)findViewById(R.id.content_parent);
         mTitleArea = findViewById(R.id.title_area);
+        mTitleArea.setOnClickListener(this);
 
         mSettingsButton = (ImageView)findViewById(R.id.settings_button);
-        mSettingsButton.setOnClickListener(this);
         mNotificationButton = (ImageView)findViewById(R.id.notification_button);
-        mNotificationButton.setOnClickListener(this);
 
         mNotificationScroller = findViewById(R.id.notification_scroller);
         mNotificationGlow = findViewById(R.id.notification_glow);
@@ -178,10 +177,12 @@ public class NotificationPanel extends LinearLayout implements StatusBarPanel,
     }
 
     public void onClick(View v) {
-        if (v == mSettingsButton) {
-            switchToSettingsMode();
-        } else if (v == mNotificationButton) {
-            switchToNotificationMode();
+        if (v == mTitleArea) {
+            if (mSettingsView == null) {
+                switchToSettingsMode();
+            } else {
+                switchToNotificationMode();
+            }
         }
     }