Merge "updated pin input focused state to show outline" into main (b3f4129f) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -343,3 +343,10 @@ flag {
		description: "Relocate Smartspace to bottom of the Lock Screen"
		bug: "316212788"
		}

		flag {
		name: "pin_input_field_styled_focus_state"
		namespace: "systemui"
		description: "Enables styled focus states on pin input field if keyboard is connected"
		bug: "316106516"
		}

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardPinBasedInputViewControllerTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import com.android.systemui.SysuiTestCase;
		import com.android.systemui.classifier.FalsingCollector;
		import com.android.systemui.classifier.FalsingCollectorFake;
		import com.android.systemui.flags.FakeFeatureFlags;
		import com.android.systemui.keyboard.data.repository.FakeKeyboardRepository;
		import com.android.systemui.res.R;
		import com.android.systemui.user.domain.interactor.SelectedUserInteractor;

		@@ -107,7 +108,7 @@ public class KeyguardPinBasedInputViewControllerTest extends SysuiTestCase {
		mKeyguardUpdateMonitor, mSecurityMode, mLockPatternUtils, mKeyguardSecurityCallback,
		mKeyguardMessageAreaControllerFactory, mLatencyTracker, mLiftToactivateListener,
		mEmergencyButtonController, mFalsingCollector, featureFlags,
		mSelectedUserInteractor) {
		mSelectedUserInteractor, new FakeKeyboardRepository()) {
		@Override
		public void onResume(int reason) {
		super.onResume(reason);

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardPinViewControllerTest.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import com.android.systemui.classifier.FalsingCollector
		import com.android.systemui.classifier.FalsingCollectorFake
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyboard.data.repository.FakeKeyboardRepository
		import com.android.systemui.res.R
		import com.android.systemui.statusbar.policy.DevicePostureController
		import com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_HALF_OPENED
		@@ -141,7 +142,8 @@ class KeyguardPinViewControllerTest : SysuiTestCase() {
		postureController,
		featureFlags,
		mSelectedUserInteractor,
		uiEventLogger
		uiEventLogger,
		FakeKeyboardRepository()
		)
		}

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSimPinViewControllerTest.kt

+5 −5

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.keyguard

		import android.telephony.PinResult
		import android.telephony.TelephonyManager
		import android.testing.TestableLooper
		import android.view.LayoutInflater
		@@ -28,9 +27,11 @@ import com.android.systemui.Flags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.classifier.FalsingCollector
		import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.keyboard.data.repository.FakeKeyboardRepository
		import com.android.systemui.res.R
		import com.android.systemui.user.domain.interactor.SelectedUserInteractor
		import com.android.systemui.util.mockito.any
		import com.android.systemui.util.mockito.mock
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		@@ -39,7 +40,6 @@ import org.mockito.ArgumentMatchers.anyString
		import org.mockito.Mock
		import org.mockito.Mockito
		import org.mockito.Mockito.anyInt
		import org.mockito.Mockito.mock
		import org.mockito.Mockito.never
		import org.mockito.Mockito.reset
		import org.mockito.Mockito.verify
		@@ -75,8 +75,7 @@ class KeyguardSimPinViewControllerTest : SysuiTestCase() {
		`when`(messageAreaControllerFactory.create(Mockito.any(KeyguardMessageArea::class.java)))
		.thenReturn(keyguardMessageAreaController)
		`when`(telephonyManager.createForSubscriptionId(anyInt())).thenReturn(telephonyManager)
		`when`(telephonyManager.supplyIccLockPin(anyString()))
		.thenReturn(mock(PinResult::class.java))
		`when`(telephonyManager.supplyIccLockPin(anyString())).thenReturn(mock())
		simPinView =
		LayoutInflater.from(context).inflate(R.layout.keyguard_sim_pin_view, null)
		as KeyguardSimPinView
		@@ -97,7 +96,8 @@ class KeyguardSimPinViewControllerTest : SysuiTestCase() {
		falsingCollector,
		emergencyButtonController,
		fakeFeatureFlags,
		mSelectedUserInteractor
		mSelectedUserInteractor,
		FakeKeyboardRepository()
		)
		underTest.init()
		underTest.onViewAttached()

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSimPukViewControllerTest.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import com.android.systemui.Flags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.classifier.FalsingCollector
		import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.keyboard.data.repository.FakeKeyboardRepository
		import com.android.systemui.res.R
		import com.android.systemui.user.domain.interactor.SelectedUserInteractor
		import com.android.systemui.util.mockito.any
		@@ -91,6 +92,7 @@ class KeyguardSimPukViewControllerTest : SysuiTestCase() {
		emergencyButtonController,
		fakeFeatureFlags,
		mSelectedUserInteractor,
		FakeKeyboardRepository()
		)
		underTest.init()
		}