Merge "Migrate bouncer messages flag to aconfig" into main (dd56064f) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -211,6 +211,13 @@ flag {
		bug: "317208379"
		}

		flag {
		name: "revamped_bouncer_messages"
		namespace: "systemui"
		description: "Change the bouncer message to be a 2-line more descriptive message"
		bug: "236891644"
		}

		flag {
		name: "rest_to_unlock"
		namespace: "systemui"

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.internal.util.LatencyTracker
		import com.android.internal.widget.LockPatternUtils
		import com.android.systemui.Flags as AconfigFlags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.classifier.FalsingCollector
		import com.android.systemui.flags.FakeFeatureFlags
		@@ -90,8 +91,8 @@ class KeyguardPasswordViewControllerTest : SysuiTestCase() {
		.thenReturn(mock(ImageView::class.java))
		`when`(keyguardPasswordView.resources).thenReturn(context.resources)
		val fakeFeatureFlags = FakeFeatureFlags()
		fakeFeatureFlags.set(Flags.REVAMPED_BOUNCER_MESSAGES, true)
		fakeFeatureFlags.set(Flags.LOCKSCREEN_ENABLE_LANDSCAPE, false)
		mSetFlagsRule.enableFlags(AconfigFlags.FLAG_REVAMPED_BOUNCER_MESSAGES)
		keyguardPasswordViewController =
		KeyguardPasswordViewController(
		keyguardPasswordView,

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.internal.util.LatencyTracker
		import com.android.internal.widget.LockPatternUtils
		import com.android.systemui.Flags as AConfigFlags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.classifier.FalsingCollector
		import com.android.systemui.classifier.FalsingCollectorFake
		@@ -75,8 +76,7 @@ class KeyguardPatternViewControllerTest : SysuiTestCase() {
		private lateinit var mKeyguardMessageAreaControllerFactory:
		KeyguardMessageAreaController.Factory

		@Mock
		private lateinit var mSelectedUserInteractor: SelectedUserInteractor
		@Mock private lateinit var mSelectedUserInteractor: SelectedUserInteractor

		@Mock
		private lateinit var mKeyguardMessageAreaController:
		@@ -95,7 +95,6 @@ class KeyguardPatternViewControllerTest : SysuiTestCase() {
		whenever(mKeyguardMessageAreaControllerFactory.create(any()))
		.thenReturn(mKeyguardMessageAreaController)
		fakeFeatureFlags = FakeFeatureFlags()
		fakeFeatureFlags.set(Flags.REVAMPED_BOUNCER_MESSAGES, false)
		fakeFeatureFlags.set(Flags.LOCKSCREEN_ENABLE_LANDSCAPE, false)
		mKeyguardPatternView =
		View.inflate(mContext, R.layout.keyguard_pattern_view, null) as KeyguardPatternView
		@@ -166,7 +165,7 @@ class KeyguardPatternViewControllerTest : SysuiTestCase() {

		@Test
		fun withFeatureFlagOn_oldMessage_isHidden() {
		fakeFeatureFlags.set(Flags.REVAMPED_BOUNCER_MESSAGES, true)
		mSetFlagsRule.enableFlags(AConfigFlags.FLAG_REVAMPED_BOUNCER_MESSAGES)

		mKeyguardPatternViewController.onViewAttached()

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ 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.flags.Flags;
		import com.android.systemui.res.R;
		import com.android.systemui.user.domain.interactor.SelectedUserInteractor;

		@@ -103,8 +102,7 @@ public class KeyguardPinBasedInputViewControllerTest extends SysuiTestCase {

		when(mPinBasedInputView.getResources()).thenReturn(getContext().getResources());
		FakeFeatureFlags featureFlags = new FakeFeatureFlags();
		featureFlags.set(Flags.REVAMPED_BOUNCER_MESSAGES, true);

		mSetFlagsRule.enableFlags(com.android.systemui.Flags.FLAG_REVAMPED_BOUNCER_MESSAGES);
		mKeyguardPinViewController = new KeyguardPinBasedInputViewController(mPinBasedInputView,
		mKeyguardUpdateMonitor, mSecurityMode, mLockPatternUtils, mKeyguardSecurityCallback,
		mKeyguardMessageAreaControllerFactory, mLatencyTracker, mLiftToactivateListener,

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import com.android.internal.logging.UiEventLogger
		import com.android.internal.widget.LockPatternUtils
		import com.android.keyguard.KeyguardSecurityContainer.UserSwitcherViewMode.UserSwitcherCallback
		import com.android.keyguard.KeyguardSecurityModel.SecurityMode
		import com.android.systemui.Flags as AConfigFlags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.biometrics.FaceAuthAccessibilityDelegate
		import com.android.systemui.biometrics.SideFpsController
		@@ -196,12 +197,12 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() {
		whenever(deviceProvisionedController.isUserSetup(anyInt())).thenReturn(true)

		featureFlags = FakeFeatureFlags()
		featureFlags.set(Flags.REVAMPED_BOUNCER_MESSAGES, true)
		featureFlags.set(Flags.BOUNCER_USER_SWITCHER, false)
		featureFlags.set(Flags.KEYGUARD_WM_STATE_REFACTOR, false)
		featureFlags.set(Flags.REFACTOR_KEYGUARD_DISMISS_INTENT, false)
		featureFlags.set(Flags.LOCKSCREEN_ENABLE_LANDSCAPE, false)

		mSetFlagsRule.enableFlags(AConfigFlags.FLAG_REVAMPED_BOUNCER_MESSAGES)
		keyguardPasswordViewController =
		KeyguardPasswordViewController(
		keyguardPasswordView,