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

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

Change-Id: I102dcb81ece9aed4c827e669d6963b7f3edfd7d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-07-14 18:07:45 +00:00
committed by Automerger Merge Worker
parent 82a9156b14 e12369e3cf
commit a6ace94ff1
3 changed files with 11 additions and 5 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

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

@@ -965,7 +965,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

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