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

Commit 917dcf8c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Force-clear nav bar flags when phone finishes booting." into rvc-dev am: b236787b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813213

Change-Id: I474883fefe62960a4183dc841ba0ab4d7f373de4
parents 67239d96 b236787b

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+13 −3
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
        @Override

        public void onBouncerVisiblityChanged(boolean shown) {

            synchronized (KeyguardViewMediator.this) {

                adjustStatusBarLocked(shown);

                adjustStatusBarLocked(shown, false);

            }

        }
@@ -2003,10 +2003,12 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
    }



    private void adjustStatusBarLocked() {

        adjustStatusBarLocked(false /* forceHideHomeRecentsButtons */);

        adjustStatusBarLocked(false /* forceHideHomeRecentsButtons */,

                false /* forceClearFlags */);

    }



    private void adjustStatusBarLocked(boolean forceHideHomeRecentsButtons) {

    private void adjustStatusBarLocked(boolean forceHideHomeRecentsButtons,

            boolean forceClearFlags) {

        if (mStatusBarManager == null) {

            mStatusBarManager = (StatusBarManager)

                    mContext.getSystemService(Context.STATUS_BAR_SERVICE);
@@ -2018,6 +2020,13 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
            // Disable aspects of the system/status/navigation bars that must not be re-enabled by

            // windows that appear on top, ever

            int flags = StatusBarManager.DISABLE_NONE;



            // TODO (b/155663717) After restart, status bar will not properly hide home button

            //  unless disable is called to show un-hide it once first

            if (forceClearFlags) {

                mStatusBarManager.disable(flags);

            }



            if (forceHideHomeRecentsButtons || isShowingAndNotOccluded()) {

                if (!mShowHomeOverLockscreen || !mInGestureNavigationMode) {

                    flags |= StatusBarManager.DISABLE_HOME;
@@ -2141,6 +2150,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
    public void onBootCompleted() {

        synchronized (this) {

            mBootCompleted = true;

            adjustStatusBarLocked(false, true);

            if (mBootSendUserPresent) {

                sendUserPresentBroadcast();

            }