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

Merge "Fix sidefps not visible after home-control longpress" into tm-qpr-dev am: f1840aed7e

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

Change-Id: Ifb4b47c3733e0c3b8be67fac764622357318d91f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nicolò Mazzucato
2022-08-30 12:11:41 +00:00
committed by Automerger Merge Worker
parent 8ab66503a0 f1840aed7e
commit 2245012edb
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
View File

@@ -418,6 +418,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED, state); SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED, state);
getCurrentSecurityController().onResume(reason); getCurrentSecurityController().onResume(reason);
updateSideFpsVisibility();
} }
mView.onResume( mView.onResume(
mSecurityModel.getSecurityMode(KeyguardUpdateMonitor.getCurrentUser()), mSecurityModel.getSecurityMode(KeyguardUpdateMonitor.getCurrentUser()),

27
packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java
View File

@@ -386,6 +386,33 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase {
verify(mSidefpsController, never()).show(); verify(mSidefpsController, never()).show();
} }
@Test
public void onResume_sideFpsHintShouldBeShown_sideFpsHintShown() {
setupGetSecurityView();
setupConditionsToEnableSideFpsHint();
mKeyguardSecurityContainerController.onBouncerVisibilityChanged(View.VISIBLE);
reset(mSidefpsController);
mKeyguardSecurityContainerController.onResume(0);
verify(mSidefpsController).show();
verify(mSidefpsController, never()).hide();
}
@Test
public void onResume_sideFpsHintShouldNotBeShown_sideFpsHintHidden() {
setupGetSecurityView();
setupConditionsToEnableSideFpsHint();
setSideFpsHintEnabledFromResources(false);
mKeyguardSecurityContainerController.onBouncerVisibilityChanged(View.VISIBLE);
reset(mSidefpsController);
mKeyguardSecurityContainerController.onResume(0);
verify(mSidefpsController).hide();
verify(mSidefpsController, never()).show();
}
@Test @Test
public void showNextSecurityScreenOrFinish_setsSecurityScreenToPinAfterSimPinUnlock() { public void showNextSecurityScreenOrFinish_setsSecurityScreenToPinAfterSimPinUnlock() {
// GIVEN the current security method is SimPin // GIVEN the current security method is SimPin