Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Bouncer-Showing Status." into sc-dev

Browse Source
This commit is contained in:
Dave Mankoff
2021-07-02 13:25:28 +00:00
committed by Android (Google) Code Review
parent 267216bdb0 c2e6868f2c
commit 89646f1b97
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,6 +367,10 @@ public class KeyguardBouncer {
return mShowingSoon || mExpansion != EXPANSION_HIDDEN && mExpansion != EXPANSION_VISIBLE; 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 * @return {@code true} when bouncer's pre-hide animation already started but isn't completely
* hidden yet, {@code false} otherwise. * hidden yet, {@code false} otherwise.

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

@@ -857,7 +857,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
@Override @Override
public boolean bouncerIsOrWillBeShowing() { public boolean bouncerIsOrWillBeShowing() {
return mBouncer.isShowing() || mBouncer.inTransit(); return mBouncer.isShowing() || mBouncer.getShowingSoon();
} }
public boolean isFullscreenBouncer() { public boolean isFullscreenBouncer() {