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

Commit a8ef3b04 authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Suppress quick settings if setup has not been completed. 

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
parent bf0e106a

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();