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

Commit c2e6868f authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Fix Bouncer-Showing Status. 

Prior this change, if you drag up slowly on the lock screen,
(no password/pin), it will mark the bouncer as showing because
it thought the bouncher "would" show. The Bouncer never actually shows,
however, so we get stuck in that state.

With this change, we ensure that the bouncer is never marked as showing
in that scenario.

This fixes an unexpected visual artifact where the sim-pin error messsage
would show on top of HUNs because it was left visible when the Bouncer
was marked as showing.

Fixes: 191733743
Test: manual
Change-Id: Ia2e7dc72ca57ae932cb58e99410daffc9e7c0672
parent 5ce1b8c6

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

+4 −0
Original line number Diff line number Diff line
@@ -367,6 +367,10 @@ public class KeyguardBouncer { 
        return mShowingSoon || mExpansion != EXPANSION_HIDDEN && mExpansion != EXPANSION_VISIBLE;

    }



    public boolean getShowingSoon() {

        return mShowingSoon;

    }



    /**

     * @return {@code true} when bouncer's pre-hide animation already started but isn't completely

     *         hidden yet, {@code false} otherwise.

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

+1 −1
Original line number Diff line number Diff line
@@ -857,7 +857,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 


    @Override

    public boolean bouncerIsOrWillBeShowing() {

        return mBouncer.isShowing() || mBouncer.inTransit();

        return mBouncer.isShowing() || mBouncer.getShowingSoon();

    }



    public boolean isFullscreenBouncer() {