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

Commit b7d32741 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Fix issue where bouncer won't be dismissed when being dragged 

Because the animation might have finished but bouncer is not fully visible yet.

Test: start dragging, wait for animation, then auth with face
Fixes: 132846921
Change-Id: I0155d0ddffb628c94c9d427826f54995bc9b3671
parent 74a07534

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

+3 −3
Original line number Diff line number Diff line
@@ -346,10 +346,10 @@ public class KeyguardBouncer { 
    }



    /**

     * {@link #show(boolean)} was called but we're not showing yet.

     * {@link #show(boolean)} was called but we're not showing yet, or being dragged.

     */

    public boolean willShowSoon() {

        return mShowingSoon;

    public boolean inTransit() {

        return mShowingSoon || mExpansion != EXPANSION_HIDDEN;

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
     * animation didn't finish yet.

     */

    public boolean bouncerIsOrWillBeShowing() {

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

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

    }



    public boolean isFullscreenBouncer() {