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

Commit 4a32b518 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents b2bbf2f1 a59215aa

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

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

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

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

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

    }



    private boolean showUserSwitcher(boolean isDemo) {

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

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


    @Override

    public void onAttachedToWindow() {

        super.onAttachedToWindow();

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

        requestApplyInsets();

    }