diff options
author | Daniel Sandler <dsandler@android.com> | 2012-10-16 22:16:11 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-16 22:16:11 -0700 |
commit | f1dacd0e89d98ad6b1b4d7d74107ef9c471cf537 (patch) | |
tree | 645a50532a490dbd3ea5373f7dba2965a7e0c857 | |
parent | 6facef70b5d6588450c6ee59a676a0cf3bfc745e (diff) | |
parent | 91ffeddb8b6ceec9a18ae34f88bd56560335de7f (diff) | |
download | frameworks_base-f1dacd0e89d98ad6b1b4d7d74107ef9c471cf537.zip frameworks_base-f1dacd0e89d98ad6b1b4d7d74107ef9c471cf537.tar.gz frameworks_base-f1dacd0e89d98ad6b1b4d7d74107ef9c471cf537.tar.bz2 |
am 91ffeddb: Hide settings button from tablet notification panel.
* commit '91ffeddb8b6ceec9a18ae34f88bd56560335de7f':
Hide settings button from tablet notification panel.
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 1dae726..24f76bb 100644 --- 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 class PhoneStatusBar extends BaseStatusBar { 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) { |