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

Suppress quick settings if setup has not been completed.

Browse Source 
The button was already hidden, but there are lots of other
ways to get into QS that should check for USER_SETUP.

Bug: 7638795
Change-Id: Ib6c48fc02e833670768e7dc76e25c38097b88c18
This commit is contained in:
Daniel Sandler
2012-11-29 15:52:39 -05:00
parent bf0e106a7d
commit a8ef3b044e
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: " +
"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 @@ public class PhoneStatusBar extends BaseStatusBar {
return;
}
// Settings are not available in setup
if (!mUserSetup) return;
if (mHasFlipSettings) {
mNotificationPanel.expand();
if (mFlipSettingsView.getVisibility() != View.VISIBLE) {
@@ -1501,6 +1504,9 @@ public class PhoneStatusBar extends BaseStatusBar {
}
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 class PhoneStatusBar extends BaseStatusBar {
}
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();