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

Merge "Bouncer should dismiss if being tracked when face unlocked" into tm-d1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-14 17:46:28 +00:00
committed by Android (Google) Code Review
parent f1fa5105b7 80771ec563
commit e12369e3cf
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -2692,7 +2692,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
/** Hides the surface behind the keyguard by re-showing the keyguard/activity lock screen. */ /** Hides the surface behind the keyguard by re-showing the keyguard/activity lock screen. */
public void hideSurfaceBehindKeyguard() { public void hideSurfaceBehindKeyguard() {
mSurfaceBehindRemoteAnimationRequested = false; mSurfaceBehindRemoteAnimationRequested = false;
mKeyguardStateController.notifyKeyguardGoingAway(false);
if (mShowing) { if (mShowing) {
setShowingLocked(true, true); setShowingLocked(true, true);
} }

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

@@ -397,10 +397,6 @@ 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

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

10
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
View File

@@ -380,6 +380,16 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
verify(mAlternateAuthInterceptor).hideAlternateAuthBouncer(); verify(mAlternateAuthInterceptor).hideAlternateAuthBouncer();
} }
@Test
public void testBouncerIsOrWillBeShowing_whenBouncerIsInTransit() {
when(mBouncer.isShowing()).thenReturn(false);
when(mBouncer.inTransit()).thenReturn(true);
assertTrue(
"Is or will be showing should be true when bouncer is in transit",
mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing());
}
@Test @Test
public void testShowAltAuth_unlockingWithBiometricNotAllowed() { public void testShowAltAuth_unlockingWithBiometricNotAllowed() {
// GIVEN alt auth exists, unlocking with biometric isn't allowed // GIVEN alt auth exists, unlocking with biometric isn't allowed