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 
am: a95904e196

Change-Id: I0798609f3741e36ce755cd7215560b2e313b3632
This commit is contained in:
Lucas Dupin
2019-07-12 19:06:43 -07:00
committed by android-build-merger
parent b45b84324b a95904e196
commit 127aeecbca
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() {
return mShowingSoon;
public boolean inTransit() {
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.
*/
public boolean bouncerIsOrWillBeShowing() {
return mBouncer.isShowing() || mBouncer.willShowSoon();
return mBouncer.isShowing() || mBouncer.inTransit();
}
public boolean isFullscreenBouncer() {