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

Commit c1ed0873 authored by Amin Shaikh's avatar Amin Shaikh Committed by android-build-merger
Browse files

Merge "Make settings icon invisible when QS is collapsed." into pi-dev 

am: 4a32b518

Change-Id: I19fb5223a5715c83eb708431eaee8632cb960575
parents b2ff0c01 4a32b518

packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -284,6 +284,7 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
        final boolean isDemo = UserManager.isDeviceInDemoMode(mContext);

        final boolean isDemo = UserManager.isDeviceInDemoMode(mContext);

        mMultiUserSwitch.setVisibility(showUserSwitcher(isDemo) ? View.VISIBLE : View.INVISIBLE);

        mMultiUserSwitch.setVisibility(showUserSwitcher(isDemo) ? View.VISIBLE : View.INVISIBLE);

        mEdit.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE);

        mEdit.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE);

        mSettingsButton.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE);

    }

    }





    private boolean showUserSwitcher(boolean isDemo) {

    private boolean showUserSwitcher(boolean isDemo) {

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -366,6 +366,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements 




    @Override

    @Override

    public void onAttachedToWindow() {

    public void onAttachedToWindow() {

        super.onAttachedToWindow();

        Dependency.get(StatusBarIconController.class).addIconGroup(mIconManager);

        Dependency.get(StatusBarIconController.class).addIconGroup(mIconManager);

        requestApplyInsets();

        requestApplyInsets();

    }

    }