am 590e0e5b: am 5dde83c4: am 0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
* commit '590e0e5b8dbc1f9d9bef69d675b158d6a36ac073':
Suppress quick settings if setup has not been completed.
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 7371ce2..30af333 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -298,7 +298,7 @@
if (MULTIUSER_DEBUG) Slog.d(TAG, String.format("User setup changed: " +
"selfChange=%s userSetup=%s mUserSetup=%s",
selfChange, userSetup, mUserSetup));
- if (mSettingsButton != null && !mHasSettingsPanel) {
+ if (mSettingsButton != null && mHasFlipSettings) {
mSettingsButton.setVisibility(userSetup ? View.VISIBLE : View.INVISIBLE);
}
if (mSettingsPanel != null) {
@@ -1488,6 +1488,9 @@
return;
}
+ // Settings are not available in setup
+ if (!mUserSetup) return;
+
if (mHasFlipSettings) {
mNotificationPanel.expand();
if (mFlipSettingsView.getVisibility() != View.VISIBLE) {
@@ -1501,6 +1504,9 @@
}
public void switchToSettings() {
+ // Settings are not available in setup
+ if (!mUserSetup) return;
+
mFlipSettingsView.setScaleX(1f);
mFlipSettingsView.setVisibility(View.VISIBLE);
mSettingsButton.setVisibility(View.GONE);
@@ -1512,6 +1518,9 @@
}
public void flipToSettings() {
+ // Settings are not available in setup
+ if (!mUserSetup) return;
+
if (mFlipSettingsViewAnim != null) mFlipSettingsViewAnim.cancel();
if (mScrollViewAnim != null) mScrollViewAnim.cancel();
if (mSettingsButtonAnim != null) mSettingsButtonAnim.cancel();