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

Merge "Show Bouncer (Unocclude it) if Activity Dismissing Keyguard is launched while Keyguard is occluded." into rvc-dev am: 4b7fbdfb6d

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

Change-Id: Ia945ec0ded620d958dcd6ba7674a555e57b2b8a6
This commit is contained in:
Youngjun Kwak
2020-06-11 00:22:29 +00:00
committed by Automerger Merge Worker
parent 882fa9b249 4b7fbdfb6d
commit cf1afd726c
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java
View File

@@ -103,6 +103,7 @@ public class CarKeyguardViewController extends OverlayViewController implements
private KeyguardBouncer mBouncer;
private OnKeyguardCancelClickedListener mKeyguardCancelClickedListener;
private boolean mShowing;
private boolean mIsOccluded;
@Inject
public CarKeyguardViewController(
@@ -220,6 +221,7 @@ public class CarKeyguardViewController extends OverlayViewController implements
@Override
public void setOccluded(boolean occluded, boolean animate) {
mIsOccluded = occluded;
getOverlayViewGlobalStateController().setOccluded(occluded);
if (!occluded) {
reset(/* hideBouncerWhenShowing= */ false);
@@ -244,6 +246,12 @@ public class CarKeyguardViewController extends OverlayViewController implements
@Override
public void dismissAndCollapse() {
// If dismissing and collapsing Keyguard is requested (e.g. by a Keyguard-dismissing
// Activity) while Keyguard is occluded, unocclude Keyguard so the user can authenticate to
// dismiss Keyguard.
if (mIsOccluded) {
setOccluded(/* occluded= */ false, /* animate= */ false);
}
if (!mBouncer.isSecure()) {
hide(/* startTime= */ 0, /* fadeoutDuration= */ 0);
}