Hide settings button from tablet notification panel.

dsandler · dsandler · commit 91ffeddb8b6c · 2012-10-17T01:11:05.000-04:00
Bug: 7363279
Change-Id: I90f4286a596527485c462773f2553ed4986f60b2
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -297,7 +297,7 @@ public void onChange(boolean selfChange) {
             if (MULTIUSER_DEBUG) Slog.d(TAG, String.format("User setup changed: " +
                     "selfChange=%s userSetup=%s mUserSetup=%s",
                     selfChange, userSetup, mUserSetup));
-            if (mSettingsButton != null) {
+            if (mSettingsButton != null && !mHasSettingsPanel) {
                 mSettingsButton.setVisibility(userSetup ? View.VISIBLE : View.INVISIBLE);
             }
             if (mSettingsPanel != null) {

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ public void onChange(boolean selfChange) {`
`297`	`297`	`if (MULTIUSER_DEBUG) Slog.d(TAG, String.format("User setup changed: " +`
`298`	`298`	`"selfChange=%s userSetup=%s mUserSetup=%s",`
`299`	`299`	`selfChange, userSetup, mUserSetup));`
`300`		`- if (mSettingsButton != null) {`
	`300`	`+ if (mSettingsButton != null && !mHasSettingsPanel) {`
`301`	`301`	`mSettingsButton.setVisibility(userSetup ? View.VISIBLE : View.INVISIBLE);`
`302`	`302`	`}`
`303`	`303`	`if (mSettingsPanel != null) {`