Merge "Fix sidefps not visible after home-control longpress" into tm-qpr-dev (f1840aed) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
		SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED, state);

		getCurrentSecurityController().onResume(reason);
		updateSideFpsVisibility();
		}
		mView.onResume(
		mSecurityModel.getSecurityMode(KeyguardUpdateMonitor.getCurrentUser()),

+27 −0

Original line number	Diff line number	Diff line
		@@ -386,6 +386,33 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase {
		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
		public void showNextSecurityScreenOrFinish_setsSecurityScreenToPinAfterSimPinUnlock() {
		// GIVEN the current security method is SimPin