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

Commit bdfd1165 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "Fix Bouncer-Showing Status." into sc-dev am: 89646f1b am: 001bcae0 

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

Change-Id: I63198dcd431703e73d50f5d74ba7a2368f84b759
parents 50b5e262 001bcae0

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