Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into tm-dev (dc25f23c) · Commits · e / os / android_frameworks_base

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

+4 −5

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

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -43,7 +43,6 @@ import com.android.settingslib.Utils;
	import com.android.systemui.R;		import com.android.systemui.R;
	import com.android.systemui.classifier.FalsingCollector;		import com.android.systemui.classifier.FalsingCollector;
	import com.android.systemui.dagger.qualifiers.Main;		import com.android.systemui.dagger.qualifiers.Main;
	import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
	import com.android.systemui.util.concurrency.DelayableExecutor;		import com.android.systemui.util.concurrency.DelayableExecutor;

	import java.util.List;		import java.util.List;
	@@ -56,7 +55,7 @@ public class KeyguardPasswordViewController
	private final KeyguardSecurityCallback mKeyguardSecurityCallback;		private final KeyguardSecurityCallback mKeyguardSecurityCallback;
	private final InputMethodManager mInputMethodManager;		private final InputMethodManager mInputMethodManager;
	private final DelayableExecutor mMainExecutor;		private final DelayableExecutor mMainExecutor;
	private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;		private final KeyguardViewController mKeyguardViewController;
	private final boolean mShowImeAtScreenOn;		private final boolean mShowImeAtScreenOn;
	private EditText mPasswordEntry;		private EditText mPasswordEntry;
	private ImageView mSwitchImeButton;		private ImageView mSwitchImeButton;
	@@ -119,14 +118,14 @@ public class KeyguardPasswordViewController
	@Main DelayableExecutor mainExecutor,		@Main DelayableExecutor mainExecutor,
	@Main Resources resources,		@Main Resources resources,
	FalsingCollector falsingCollector,		FalsingCollector falsingCollector,
	StatusBarKeyguardViewManager statusBarKeyguardViewManager) {		KeyguardViewController keyguardViewController) {
	super(view, keyguardUpdateMonitor, securityMode, lockPatternUtils, keyguardSecurityCallback,		super(view, keyguardUpdateMonitor, securityMode, lockPatternUtils, keyguardSecurityCallback,
	messageAreaControllerFactory, latencyTracker, falsingCollector,		messageAreaControllerFactory, latencyTracker, falsingCollector,
	emergencyButtonController);		emergencyButtonController);
	mKeyguardSecurityCallback = keyguardSecurityCallback;		mKeyguardSecurityCallback = keyguardSecurityCallback;
	mInputMethodManager = inputMethodManager;		mInputMethodManager = inputMethodManager;
	mMainExecutor = mainExecutor;		mMainExecutor = mainExecutor;
	mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;		mKeyguardViewController = keyguardViewController;
	mShowImeAtScreenOn = resources.getBoolean(R.bool.kg_show_ime_at_screen_on);		mShowImeAtScreenOn = resources.getBoolean(R.bool.kg_show_ime_at_screen_on);
	mPasswordEntry = mView.findViewById(mView.getPasswordTextViewId());		mPasswordEntry = mView.findViewById(mView.getPasswordTextViewId());
	mSwitchImeButton = mView.findViewById(R.id.switch_ime_button);		mSwitchImeButton = mView.findViewById(R.id.switch_ime_button);
	@@ -209,7 +208,7 @@ public class KeyguardPasswordViewController
	}		}

	private void showInput() {		private void showInput() {
	if (!mStatusBarKeyguardViewManager.isBouncerShowing()) {		if (!mKeyguardViewController.isBouncerShowing()) {
	return;		return;
	}		}

packages/SystemUI/tests/src/com/android/keyguard/KeyguardPasswordViewControllerTest.kt

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,6 @@ import com.android.internal.widget.LockPatternUtils
	import com.android.systemui.R		import com.android.systemui.R
	import com.android.systemui.SysuiTestCase		import com.android.systemui.SysuiTestCase
	import com.android.systemui.classifier.FalsingCollector		import com.android.systemui.classifier.FalsingCollector
	import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager
	import com.android.systemui.util.concurrency.DelayableExecutor		import com.android.systemui.util.concurrency.DelayableExecutor
	import org.junit.Before		import org.junit.Before
	import org.junit.Test		import org.junit.Test
	@@ -63,7 +62,7 @@ class KeyguardPasswordViewControllerTest : SysuiTestCase() {
	@Mock		@Mock
	lateinit var falsingCollector: FalsingCollector		lateinit var falsingCollector: FalsingCollector
	@Mock		@Mock
	lateinit var statusBarKeyguardViewManager: StatusBarKeyguardViewManager		lateinit var keyguardViewController: KeyguardViewController
	@Mock		@Mock
	private lateinit var mKeyguardMessageArea: KeyguardMessageArea		private lateinit var mKeyguardMessageArea: KeyguardMessageArea
	@Mock		@Mock
	@@ -92,13 +91,13 @@ class KeyguardPasswordViewControllerTest : SysuiTestCase() {
	mainExecutor,		mainExecutor,
	mContext.resources,		mContext.resources,
	falsingCollector,		falsingCollector,
	statusBarKeyguardViewManager		keyguardViewController
	)		)
	}		}

	@Test		@Test
	fun testFocusWhenBouncerIsShown() {		fun testFocusWhenBouncerIsShown() {
	Mockito.`when`(statusBarKeyguardViewManager.isBouncerShowing).thenReturn(true)		Mockito.`when`(keyguardViewController.isBouncerShowing).thenReturn(true)
	Mockito.`when`(keyguardPasswordView.isShown).thenReturn(true)		Mockito.`when`(keyguardPasswordView.isShown).thenReturn(true)
	keyguardPasswordViewController.onResume(KeyguardSecurityView.VIEW_REVEALED)		keyguardPasswordViewController.onResume(KeyguardSecurityView.VIEW_REVEALED)
	keyguardPasswordView.post { verify(keyguardPasswordView).requestFocus() }		keyguardPasswordView.post { verify(keyguardPasswordView).requestFocus() }
	@@ -106,7 +105,7 @@ class KeyguardPasswordViewControllerTest : SysuiTestCase() {

	@Test		@Test
	fun testDoNotFocusWhenBouncerIsHidden() {		fun testDoNotFocusWhenBouncerIsHidden() {
	Mockito.`when`(statusBarKeyguardViewManager.isBouncerShowing).thenReturn(false)		Mockito.`when`(keyguardViewController.isBouncerShowing).thenReturn(false)
	Mockito.`when`(keyguardPasswordView.isShown).thenReturn(true)		Mockito.`when`(keyguardPasswordView.isShown).thenReturn(true)
	keyguardPasswordViewController.onResume(KeyguardSecurityView.VIEW_REVEALED)		keyguardPasswordViewController.onResume(KeyguardSecurityView.VIEW_REVEALED)
	verify(keyguardPasswordView, never()).requestFocus()		verify(keyguardPasswordView, never()).requestFocus()

packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,6 @@ import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
	import com.android.systemui.R;		import com.android.systemui.R;
	import com.android.systemui.classifier.FalsingCollector;		import com.android.systemui.classifier.FalsingCollector;
	import com.android.systemui.dagger.qualifiers.Main;		import com.android.systemui.dagger.qualifiers.Main;
	import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
	import com.android.systemui.statusbar.policy.DevicePostureController;		import com.android.systemui.statusbar.policy.DevicePostureController;
	import com.android.systemui.util.ViewController;		import com.android.systemui.util.ViewController;
	import com.android.systemui.util.concurrency.DelayableExecutor;		import com.android.systemui.util.concurrency.DelayableExecutor;
	@@ -169,7 +168,7 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView>
	private final EmergencyButtonController.Factory mEmergencyButtonControllerFactory;		private final EmergencyButtonController.Factory mEmergencyButtonControllerFactory;
	private final FalsingCollector mFalsingCollector;		private final FalsingCollector mFalsingCollector;
	private final DevicePostureController mDevicePostureController;		private final DevicePostureController mDevicePostureController;
	private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;		private final KeyguardViewController mKeyguardViewController;

	@Inject		@Inject
	public Factory(KeyguardUpdateMonitor keyguardUpdateMonitor,		public Factory(KeyguardUpdateMonitor keyguardUpdateMonitor,
	@@ -181,7 +180,7 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView>
	TelephonyManager telephonyManager, FalsingCollector falsingCollector,		TelephonyManager telephonyManager, FalsingCollector falsingCollector,
	EmergencyButtonController.Factory emergencyButtonControllerFactory,		EmergencyButtonController.Factory emergencyButtonControllerFactory,
	DevicePostureController devicePostureController,		DevicePostureController devicePostureController,
	StatusBarKeyguardViewManager statusBarKeyguardViewManager) {		KeyguardViewController keyguardViewController) {
	mKeyguardUpdateMonitor = keyguardUpdateMonitor;		mKeyguardUpdateMonitor = keyguardUpdateMonitor;
	mLockPatternUtils = lockPatternUtils;		mLockPatternUtils = lockPatternUtils;
	mLatencyTracker = latencyTracker;		mLatencyTracker = latencyTracker;
	@@ -194,7 +193,7 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView>
	mEmergencyButtonControllerFactory = emergencyButtonControllerFactory;		mEmergencyButtonControllerFactory = emergencyButtonControllerFactory;
	mFalsingCollector = falsingCollector;		mFalsingCollector = falsingCollector;
	mDevicePostureController = devicePostureController;		mDevicePostureController = devicePostureController;
	mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;		mKeyguardViewController = keyguardViewController;
	}		}

	/** Create a new {@link KeyguardInputViewController}. */		/** Create a new {@link KeyguardInputViewController}. */
	@@ -215,7 +214,7 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView>
	mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,		mKeyguardUpdateMonitor, securityMode, mLockPatternUtils,
	keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,		keyguardSecurityCallback, mMessageAreaControllerFactory, mLatencyTracker,
	mInputMethodManager, emergencyButtonController, mMainExecutor, mResources,		mInputMethodManager, emergencyButtonController, mMainExecutor, mResources,
	mFalsingCollector, mStatusBarKeyguardViewManager);		mFalsingCollector, mKeyguardViewController);

	} else if (keyguardInputView instanceof KeyguardPINView) {		} else if (keyguardInputView instanceof KeyguardPINView) {
	return new KeyguardPinViewController((KeyguardPINView) keyguardInputView,		return new KeyguardPinViewController((KeyguardPINView) keyguardInputView,

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,6 @@ import com.android.systemui.classifier.FalsingCollector;
	import com.android.systemui.flags.FeatureFlags;		import com.android.systemui.flags.FeatureFlags;
	import com.android.systemui.log.SessionTracker;		import com.android.systemui.log.SessionTracker;
	import com.android.systemui.plugins.FalsingManager;		import com.android.systemui.plugins.FalsingManager;
	import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
	import com.android.systemui.statusbar.policy.ConfigurationController;		import com.android.systemui.statusbar.policy.ConfigurationController;
	import com.android.systemui.statusbar.policy.KeyguardStateController;		import com.android.systemui.statusbar.policy.KeyguardStateController;
	import com.android.systemui.statusbar.policy.UserSwitcherController;		import com.android.systemui.statusbar.policy.UserSwitcherController;
	@@ -125,7 +124,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase {
	@Mock		@Mock
	private SessionTracker mSessionTracker;		private SessionTracker mSessionTracker;
	@Mock		@Mock
	private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;		private KeyguardViewController mKeyguardViewController;
	private Configuration mConfiguration;		private Configuration mConfiguration;

	private KeyguardSecurityContainerController mKeyguardSecurityContainerController;		private KeyguardSecurityContainerController mKeyguardSecurityContainerController;
	@@ -153,7 +152,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase {
	(KeyguardPasswordView) mKeyguardPasswordView, mKeyguardUpdateMonitor,		(KeyguardPasswordView) mKeyguardPasswordView, mKeyguardUpdateMonitor,
	SecurityMode.Password, mLockPatternUtils, null,		SecurityMode.Password, mLockPatternUtils, null,
	mKeyguardMessageAreaControllerFactory, null, null, mEmergencyButtonController,		mKeyguardMessageAreaControllerFactory, null, null, mEmergencyButtonController,
	null, mock(Resources.class), null, mStatusBarKeyguardViewManager);		null, mock(Resources.class), null, mKeyguardViewController);

	mKeyguardSecurityContainerController = new KeyguardSecurityContainerController.Factory(		mKeyguardSecurityContainerController = new KeyguardSecurityContainerController.Factory(
	mView, mAdminSecondaryLockScreenControllerFactory, mLockPatternUtils,		mView, mAdminSecondaryLockScreenControllerFactory, mLockPatternUtils,