Merge "Do not request focus during wake and unlock" into pi-dev (58fc12e8) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -173,11 +173,13 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		\|\| mStatusBar.isFullScreenUserSwitcherState()) {
		mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);
		} else if (mShowing && !mDozing) {
		if (!isWakeAndUnlocking()) {
		mBouncer.setExpansion(expansion);
		}
		if (expansion != KeyguardBouncer.EXPANSION_HIDDEN && tracking
		&& mStatusBar.isKeyguardCurrentlySecure()
		&& !mBouncer.isShowing() && !mBouncer.isAnimatingAway()) {
		mBouncer.show(false /* resetSecuritySelection /, false / animated */);
		mBouncer.show(false /* resetSecuritySelection /, false / scrimmed */);
		}
		}
		}

+10 −3

Original line number	Diff line number	Diff line
		@@ -16,14 +16,12 @@

		package com.android.systemui.statusbar.phone;

		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.ArgumentMatchers.anyBoolean;
		import static org.mockito.ArgumentMatchers.anyFloat;
		import static org.mockito.ArgumentMatchers.eq;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.reset;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.verifyZeroInteractions;
		import static org.mockito.Mockito.when;

		import android.content.Context;
		@@ -170,6 +168,15 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		verify(mBouncer, never()).setExpansion(eq(0.5f));
		}

		@Test
		public void onPanelExpansionChanged_neverTranslatesBouncerWhenWakeAndUnlock() {
		when(mFingerprintUnlockController.getMode())
		.thenReturn(FingerprintUnlockController.MODE_WAKE_AND_UNLOCK);
		mStatusBarKeyguardViewManager.onPanelExpansionChanged(KeyguardBouncer.EXPANSION_VISIBLE,
		false /* tracking */);
		verify(mBouncer, never()).setExpansion(anyFloat());
		}

		private class TestableStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager {

		public TestableStatusBarKeyguardViewManager(Context context,