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

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

Browse Source
This commit is contained in:
Lucas Dupin
2019-07-13 01:43:42 +00:00
committed by Android (Google) Code Review
parent 22110bae84 b7d3274126
commit a95904e196
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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() { public boolean inTransit() {
return mShowingSoon; return mShowingSoon || mExpansion != EXPANSION_HIDDEN;
} }
/** /**

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

@@ -719,7 +719,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
* animation didn't finish yet. * animation didn't finish yet.
*/ */
public boolean bouncerIsOrWillBeShowing() { public boolean bouncerIsOrWillBeShowing() {
return mBouncer.isShowing() || mBouncer.willShowSoon(); return mBouncer.isShowing() || mBouncer.inTransit();
} }
public boolean isFullscreenBouncer() { public boolean isFullscreenBouncer() {