Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 590e0e5b authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 5dde83c4: am 0a6620e8: Merge "Suppress quick settings if setup has not been... 

am 5dde83c4: am 0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev

* commit '5dde83c4':
  Suppress quick settings if setup has not been completed.
parents 63c84b75 5dde83c4

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

+10 −1
Original line number Diff line number Diff line
@@ -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();