Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev

Browse Source
This commit is contained in:
Daniel Sandler
2012-11-30 10:05:01 -08:00
committed by Android (Google) Code Review
parent 7311742402 a8ef3b044e
commit 0a6620e861
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -298,7 +298,7 @@ public class PhoneStatusBar extends BaseStatusBar {
if (MULTIUSER_DEBUG) Slog.d(TAG, String.format("User setup changed: " + if (MULTIUSER_DEBUG) Slog.d(TAG, String.format("User setup changed: " +
"selfChange=%s userSetup=%s mUserSetup=%s", "selfChange=%s userSetup=%s mUserSetup=%s",
selfChange, userSetup, mUserSetup)); selfChange, userSetup, mUserSetup));
if (mSettingsButton != null && !mHasSettingsPanel) { if (mSettingsButton != null && mHasFlipSettings) {
mSettingsButton.setVisibility(userSetup ? View.VISIBLE : View.INVISIBLE); mSettingsButton.setVisibility(userSetup ? View.VISIBLE : View.INVISIBLE);
} }
if (mSettingsPanel != null) { if (mSettingsPanel != null) {
@@ -1488,6 +1488,9 @@ public class PhoneStatusBar extends BaseStatusBar {
return; return;
} }
// Settings are not available in setup
if (!mUserSetup) return;
if (mHasFlipSettings) { if (mHasFlipSettings) {
mNotificationPanel.expand(); mNotificationPanel.expand();
if (mFlipSettingsView.getVisibility() != View.VISIBLE) { if (mFlipSettingsView.getVisibility() != View.VISIBLE) {
@@ -1501,6 +1504,9 @@ public class PhoneStatusBar extends BaseStatusBar {
} }
public void switchToSettings() { public void switchToSettings() {
// Settings are not available in setup
if (!mUserSetup) return;
mFlipSettingsView.setScaleX(1f); mFlipSettingsView.setScaleX(1f);
mFlipSettingsView.setVisibility(View.VISIBLE); mFlipSettingsView.setVisibility(View.VISIBLE);
mSettingsButton.setVisibility(View.GONE); mSettingsButton.setVisibility(View.GONE);
@@ -1512,6 +1518,9 @@ public class PhoneStatusBar extends BaseStatusBar {
} }
public void flipToSettings() { public void flipToSettings() {
// Settings are not available in setup
if (!mUserSetup) return;
if (mFlipSettingsViewAnim != null) mFlipSettingsViewAnim.cancel(); if (mFlipSettingsViewAnim != null) mFlipSettingsViewAnim.cancel();
if (mScrollViewAnim != null) mScrollViewAnim.cancel(); if (mScrollViewAnim != null) mScrollViewAnim.cancel();
if (mSettingsButtonAnim != null) mSettingsButtonAnim.cancel(); if (mSettingsButtonAnim != null) mSettingsButtonAnim.cancel();