diff options
5 files changed, 2 insertions, 26 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractorTest.kt index 81db16b49f49..2b2c121fb79a 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractorTest.kt @@ -171,23 +171,9 @@ class KeyguardTouchHandlingInteractorTest : SysuiTestCase() { } @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, diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 3d3584e29def..d0beb7abc25b 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -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 diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractor.kt index beb54c7a37d8..cd49c6a4d2e0 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTouchHandlingInteractor.kt @@ -138,7 +138,7 @@ constructor( return } - if (isA11yAction || featureFlags.isEnabled(Flags.LOCK_SCREEN_LONG_PRESS_DIRECT_TO_WPP)) { + if (isA11yAction) { showSettings() } else { showMenu() diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt index 4f4aac454912..3b96be48b2cc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt @@ -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) diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt index 9fb1aa795c3c..e89abf6fc5a1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt @@ -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) |