From 71e45f55510894914ff230f88119f06261787097 Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Mon, 23 Jan 2023 13:47:12 +0000 Subject: [PATCH] Remove smartspace flag No longer needed Fixes: 234591987 Test: atest SystemUITests Change-Id: I123b0dcdf451f6884afe2df2711bc2f8122ce701 --- packages/SystemUI/res/values/flags.xml | 2 -- .../src/com/android/systemui/flags/Flags.kt | 7 ++----- .../preconditions/LockscreenPrecondition.kt | 10 +++------- .../LockscreenSmartspaceController.kt | 2 +- .../notification/NotifPipelineFlags.kt | 2 -- .../coordinator/NotifCoordinators.kt | 4 +--- .../smartspace/LockscreenPreconditionTest.kt | 20 ++++--------------- .../LockscreenSmartspaceControllerTest.kt | 14 ------------- 8 files changed, 11 insertions(+), 50 deletions(-) diff --git a/packages/SystemUI/res/values/flags.xml b/packages/SystemUI/res/values/flags.xml index c5ffc94d01af6..6354752e1b22d 100644 --- a/packages/SystemUI/res/values/flags.xml +++ b/packages/SystemUI/res/values/flags.xml @@ -33,8 +33,6 @@ true - false - false diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index fbe0cc99fc014..37525b296f8c8 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -65,8 +65,7 @@ object Flags { val FSI_ON_DND_UPDATE = unreleasedFlag(259130119, "fsi_on_dnd_update", teamfood = true) // TODO(b/265804648): Tracking Bug - @JvmField - val DISABLE_FSI = unreleasedFlag(265804648, "disable_fsi") + @JvmField val DISABLE_FSI = unreleasedFlag(265804648, "disable_fsi") // TODO(b/254512538): Tracking Bug val INSTANT_VOICE_REPLY = unreleasedFlag(111, "instant_voice_reply", teamfood = true) @@ -225,7 +224,6 @@ object Flags { // TODO(b/254513100): Tracking Bug val SMARTSPACE_SHARED_ELEMENT_TRANSITION_ENABLED = releasedFlag(401, "smartspace_shared_element_transition_enabled") - val SMARTSPACE = resourceBooleanFlag(402, R.bool.flag_smartspace, "smartspace") // TODO(b/258517050): Clean up after the feature is launched. @JvmField @@ -554,6 +552,5 @@ object Flags { // 2600 - keyboard shortcut // TODO(b/259352579): Tracking Bug - @JvmField - val SHORTCUT_LIST_SEARCH_LAYOUT = unreleasedFlag(2600, "shortcut_list_search_layout") + @JvmField val SHORTCUT_LIST_SEARCH_LAYOUT = unreleasedFlag(2600, "shortcut_list_search_layout") } diff --git a/packages/SystemUI/src/com/android/systemui/smartspace/preconditions/LockscreenPrecondition.kt b/packages/SystemUI/src/com/android/systemui/smartspace/preconditions/LockscreenPrecondition.kt index 1302ec9dbc559..88e8ad9d1baee 100644 --- a/packages/SystemUI/src/com/android/systemui/smartspace/preconditions/LockscreenPrecondition.kt +++ b/packages/SystemUI/src/com/android/systemui/smartspace/preconditions/LockscreenPrecondition.kt @@ -15,8 +15,6 @@ */ package com.android.systemui.smartspace.preconditions -import com.android.systemui.flags.FeatureFlags -import com.android.systemui.flags.Flags import com.android.systemui.smartspace.SmartspacePrecondition import com.android.systemui.statusbar.policy.DeviceProvisionedController import com.android.systemui.util.concurrency.Execution @@ -24,11 +22,9 @@ import javax.inject.Inject /** * {@link LockscreenPrecondition} covers the conditions that must be met before Smartspace can be - * used over lockscreen. These conditions include the device being provisioned with a setup user - * and the Smartspace feature flag enabled. + * used over lockscreen. These conditions include the device being provisioned with a setup user. */ class LockscreenPrecondition @Inject constructor( - private val featureFlags: FeatureFlags, private val deviceProvisionedController: DeviceProvisionedController, private val execution: Execution ) : SmartspacePrecondition { @@ -90,6 +86,6 @@ class LockscreenPrecondition @Inject constructor( override fun conditionsMet(): Boolean { execution.assertIsMainThread() - return featureFlags.isEnabled(Flags.SMARTSPACE) && deviceReady + return deviceReady } -} \ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt index 2849739760030..5b837720d2630 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt @@ -207,7 +207,7 @@ constructor( fun isEnabled(): Boolean { execution.assertIsMainThread() - return featureFlags.isEnabled(Flags.SMARTSPACE) && plugin != null + return plugin != null } private fun updateBypassEnabled() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt index 635ed7c161404..48567592c43e3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt @@ -32,8 +32,6 @@ class NotifPipelineFlags @Inject constructor( fun isDevLoggingEnabled(): Boolean = featureFlags.isEnabled(Flags.NOTIFICATION_PIPELINE_DEVELOPER_LOGGING) - fun isSmartspaceDedupingEnabled(): Boolean = featureFlags.isEnabled(Flags.SMARTSPACE) - fun fullScreenIntentRequiresKeyguard(): Boolean = featureFlags.isEnabled(Flags.FSI_REQUIRES_KEYGUARD) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt index 1399385e7654b..03a3ca55083f2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt @@ -88,9 +88,7 @@ class NotifCoordinatorsImpl @Inject constructor( mCoordinators.add(viewConfigCoordinator) mCoordinators.add(visualStabilityCoordinator) mCoordinators.add(sensitiveContentCoordinator) - if (notifPipelineFlags.isSmartspaceDedupingEnabled()) { - mCoordinators.add(smartspaceDedupingCoordinator) - } + mCoordinators.add(smartspaceDedupingCoordinator) mCoordinators.add(headsUpCoordinator) mCoordinators.add(gutsCoordinator) mCoordinators.add(preparationCoordinator) diff --git a/packages/SystemUI/tests/src/com/android/systemui/smartspace/LockscreenPreconditionTest.kt b/packages/SystemUI/tests/src/com/android/systemui/smartspace/LockscreenPreconditionTest.kt index d29e9a66a3313..fa7d869b6b95a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/smartspace/LockscreenPreconditionTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/smartspace/LockscreenPreconditionTest.kt @@ -20,8 +20,6 @@ import android.testing.AndroidTestingRunner import android.testing.TestableLooper import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.flags.FeatureFlags -import com.android.systemui.flags.Flags import com.android.systemui.smartspace.preconditions.LockscreenPrecondition import com.android.systemui.statusbar.policy.DeviceProvisionedController import com.android.systemui.util.concurrency.Execution @@ -40,9 +38,6 @@ import org.mockito.MockitoAnnotations @RunWith(AndroidTestingRunner::class) @TestableLooper.RunWithLooper class LockscreenPreconditionTest : SysuiTestCase() { - @Mock - private lateinit var featureFlags: FeatureFlags - @Mock private lateinit var deviceProvisionedController: DeviceProvisionedController @@ -64,10 +59,7 @@ class LockscreenPreconditionTest : SysuiTestCase() { fun testFullyEnabled() { `when`(deviceProvisionedController.isCurrentUserSetup).thenReturn(true) `when`(deviceProvisionedController.isDeviceProvisioned).thenReturn(true) - `when`(featureFlags.isEnabled(Mockito.eq(Flags.SMARTSPACE) ?: Flags.SMARTSPACE)) - .thenReturn(true) - val precondition = LockscreenPrecondition(featureFlags, deviceProvisionedController, - execution) + val precondition = LockscreenPrecondition(deviceProvisionedController, execution) precondition.addListener(listener) `verify`(listener).onCriteriaChanged() @@ -81,10 +73,8 @@ class LockscreenPreconditionTest : SysuiTestCase() { fun testProvisioning() { `when`(deviceProvisionedController.isCurrentUserSetup).thenReturn(true) `when`(deviceProvisionedController.isDeviceProvisioned).thenReturn(false) - `when`(featureFlags.isEnabled(Mockito.eq(Flags.SMARTSPACE) ?: Flags.SMARTSPACE)) - .thenReturn(true) val precondition = - LockscreenPrecondition(featureFlags, deviceProvisionedController, execution) + LockscreenPrecondition(deviceProvisionedController, execution) precondition.addListener(listener) verify(listener).onCriteriaChanged() @@ -109,10 +99,8 @@ class LockscreenPreconditionTest : SysuiTestCase() { fun testUserSetup() { `when`(deviceProvisionedController.isCurrentUserSetup).thenReturn(false) `when`(deviceProvisionedController.isDeviceProvisioned).thenReturn(true) - `when`(featureFlags.isEnabled(Mockito.eq(Flags.SMARTSPACE) ?: Flags.SMARTSPACE)) - .thenReturn(true) val precondition = - LockscreenPrecondition(featureFlags, deviceProvisionedController, execution) + LockscreenPrecondition(deviceProvisionedController, execution) precondition.addListener(listener) verify(listener).onCriteriaChanged() @@ -129,4 +117,4 @@ class LockscreenPreconditionTest : SysuiTestCase() { verify(listener).onCriteriaChanged() assertThat(precondition.conditionsMet()).isTrue() } -} \ No newline at end of file +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt index 4bcb54ddbbc02..43b6e4144a2e2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt @@ -34,7 +34,6 @@ import android.widget.FrameLayout import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.flags.FeatureFlags -import com.android.systemui.flags.Flags import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.BcSmartspaceConfigPlugin import com.android.systemui.plugins.BcSmartspaceDataPlugin @@ -177,8 +176,6 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { fun setUp() { MockitoAnnotations.initMocks(this) - `when`(featureFlags.isEnabled(Flags.SMARTSPACE)).thenReturn(true) - `when`(secureSettings.getUriFor(PRIVATE_LOCKSCREEN_SETTING)) .thenReturn(fakePrivateLockscreenSettingUri) `when`(secureSettings.getUriFor(NOTIF_ON_LOCKSCREEN_SETTING)) @@ -221,17 +218,6 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { deviceProvisionedListener = deviceProvisionedCaptor.value } - @Test(expected = RuntimeException::class) - fun testThrowsIfFlagIsDisabled() { - // GIVEN the feature flag is disabled - `when`(featureFlags.isEnabled(Flags.SMARTSPACE)).thenReturn(false) - - // WHEN we try to build the view - controller.buildAndConnectView(fakeParent) - - // THEN an exception is thrown - } - @Test fun connectOnlyAfterDeviceIsProvisioned() { // GIVEN an unprovisioned device and an attempt to connect