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

Merge "Don't hide the alternate bouncer on keyguardReset" into tm-qpr-dev am: 3b62ab7090

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

Change-Id: I224d9b1ac46c195cddc28f6e0062e61fc2724cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beverly Tai
2023-03-08 23:02:46 +00:00
committed by Automerger Merge Worker
parent d895a2e6e0 3b62ab7090
commit 345ae533fd
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -733,7 +733,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
} else {
showBouncerOrKeyguard(hideBouncerWhenShowing);
}
hideAlternateBouncer(false);
if (hideBouncerWhenShowing) {
hideAlternateBouncer(false);
}
mKeyguardUpdateManager.sendKeyguardReset();
updateStates();
}

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

@@ -683,4 +683,30 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
// the following call before registering centralSurfaces should NOT throw a NPE:
mStatusBarKeyguardViewManager.hideAlternateBouncer(true);
}
@Test
public void testResetHideBouncerWhenShowing_alternateBouncerHides() {
// GIVEN the keyguard is showing
reset(mAlternateBouncerInteractor);
when(mKeyguardStateController.isShowing()).thenReturn(true);
// WHEN SBKV is reset with hideBouncerWhenShowing=true
mStatusBarKeyguardViewManager.reset(true);
// THEN alternate bouncer is hidden
verify(mAlternateBouncerInteractor).hide();
}
@Test
public void testResetHideBouncerWhenShowingIsFalse_alternateBouncerHides() {
// GIVEN the keyguard is showing
reset(mAlternateBouncerInteractor);
when(mKeyguardStateController.isShowing()).thenReturn(true);
// WHEN SBKV is reset with hideBouncerWhenShowing=false
mStatusBarKeyguardViewManager.reset(false);
// THEN alternate bouncer is NOT hidden
verify(mAlternateBouncerInteractor, never()).hide();
}
}