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

Commit 7a56d1a4 authored by Adrian Roos's avatar Adrian Roos
Browse files

AOD: Fix navbar flicker when launching assistant 

When reset() gets called during unocclusion, we were hiding the
keyguard even though it is still needed while dozing; instead,
reset is now actually called after dozing finishes.

Test: Trigger assistant from AOD; verify navigation bar buttons do not show
Fixes: 64164106
Change-Id: Ic29cf40ade7d3cd492723a3f859f8a7734edad93
parent 8e9984ee

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

+7 −4
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
     */

    public void reset(boolean hideBouncerWhenShowing) {

        if (mShowing) {

            if (mOccluded) {

            if (mOccluded && !mDozing) {

                mStatusBar.hideKeyguard();

                mStatusBar.stopWaitingForKeyguardExit();

                mBouncer.hide(false /* destroyView */);
@@ -292,9 +292,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        }

        mStatusBarWindowManager.setKeyguardOccluded(occluded);



        // If Keyguard is reshown, don't hide the bouncer as it might just have been requested by

        // a FLAG_DISMISS_KEYGUARD_ACTIVITY.

        // setDozing(false) will call reset once we stop dozing.

        if (!mDozing) {

            // If Keyguard is reshown, don't hide the bouncer as it might just have been requested

            // by a FLAG_DISMISS_KEYGUARD_ACTIVITY.

            reset(false /* hideBouncerWhenShowing*/);

        }

        if (animate && !occluded && mShowing) {

            mStatusBar.animateKeyguardUnoccluding();

        }