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

Commit 127aeecb authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Fix issue where bouncer won't be dismissed when being dragged" into qt-r1-dev 

am: a95904e1

Change-Id: I0798609f3741e36ce755cd7215560b2e313b3632
parents b45b8432 a95904e1

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() {