Merge "Remove flag LOCK_SCREEN_LONG_PRESS_DIRECT_TO_WPP" into main (aa97cd9d) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractorTest.kt

+1 −17

Original line number	Diff line number	Diff line
		@@ -170,24 +170,10 @@ class KeyguardTouchHandlingInteractorTest : SysuiTestCase() {
		assertThat(shouldOpenSettings).isFalse()
		}

		@Test
		fun longPressed_openWppDirectlyEnabled_doesNotShowMenu_opensSettings() =
		testScope.runTest {
		createUnderTest(isOpenWppDirectlyEnabled = true)
		val isMenuVisible by collectLastValue(underTest.isMenuVisible)
		val shouldOpenSettings by collectLastValue(underTest.shouldOpenSettings)
		runCurrent()

		underTest.onLongPress()

		assertThat(isMenuVisible).isFalse()
		assertThat(shouldOpenSettings).isTrue()
		}

		@Test
		fun longPressed_isA11yAction_doesNotShowMenu_opensSettings() =
		testScope.runTest {
		createUnderTest(isOpenWppDirectlyEnabled = true)
		createUnderTest()
		val isMenuVisible by collectLastValue(underTest.isMenuVisible)
		val shouldOpenSettings by collectLastValue(underTest.shouldOpenSettings)
		val isA11yAction = true
		@@ -299,7 +285,6 @@ class KeyguardTouchHandlingInteractorTest : SysuiTestCase() {
		private suspend fun createUnderTest(
		isLongPressFeatureEnabled: Boolean = true,
		isRevampedWppFeatureEnabled: Boolean = true,
		isOpenWppDirectlyEnabled: Boolean = false,
		) {
		// This needs to be re-created for each test outside of kosmos since the flag values are
		// read during initialization to set up flows. Maybe there is a better way to handle that.
		@@ -313,7 +298,6 @@ class KeyguardTouchHandlingInteractorTest : SysuiTestCase() {
		featureFlags =
		kosmos.fakeFeatureFlagsClassic.apply {
		set(Flags.LOCK_SCREEN_LONG_PRESS_ENABLED, isLongPressFeatureEnabled)
		set(Flags.LOCK_SCREEN_LONG_PRESS_DIRECT_TO_WPP, isOpenWppDirectlyEnabled)
		},
		broadcastDispatcher = fakeBroadcastDispatcher,
		accessibilityManager = kosmos.accessibilityManagerWrapper,

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −6

Original line number	Diff line number	Diff line
		@@ -137,12 +137,6 @@ object Flags {
		// TODO(b/267722622): Tracking Bug
		@JvmField val WALLPAPER_PICKER_UI_FOR_AIWP = releasedFlag("wallpaper_picker_ui_for_aiwp")

		/** Whether to allow long-press on the lock screen to directly open wallpaper picker. */
		// TODO(b/277220285): Tracking bug.
		@JvmField
		val LOCK_SCREEN_LONG_PRESS_DIRECT_TO_WPP =
		unreleasedFlag("lock_screen_long_press_directly_opens_wallpaper_picker")

		/** Whether page transition animations in the wallpaper picker are enabled */
		// TODO(b/291710220): Tracking bug.
		@JvmField

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractor.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@ constructor(
		return
		}

		if (isA11yAction \|\| featureFlags.isEnabled(Flags.LOCK_SCREEN_LONG_PRESS_DIRECT_TO_WPP)) {
		if (isA11yAction) {
		showSettings()
		} else {
		showMenu()

packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,6 @@ class KeyguardBottomAreaViewModelTest(flags: FlagsParameterization) : SysuiTestC
		val featureFlags =
		FakeFeatureFlags().apply {
		set(Flags.LOCK_SCREEN_LONG_PRESS_ENABLED, false)
		set(Flags.LOCK_SCREEN_LONG_PRESS_DIRECT_TO_WPP, false)
		}

		val withDeps = KeyguardInteractorFactory.create(featureFlags = featureFlags)

packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -195,7 +195,6 @@ class KeyguardQuickAffordancesCombinedViewModelTest : SysuiTestCase() {
		val featureFlags =
		FakeFeatureFlags().apply {
		set(Flags.LOCK_SCREEN_LONG_PRESS_ENABLED, false)
		set(Flags.LOCK_SCREEN_LONG_PRESS_DIRECT_TO_WPP, false)
		}

		val withDeps = KeyguardInteractorFactory.create(featureFlags = featureFlags)