diff options
12 files changed, 2 insertions, 63 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLegacySettingSyncerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLegacySettingSyncerTest.kt index 8c54ca1a629d..4a422f05a45a 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLegacySettingSyncerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLegacySettingSyncerTest.kt @@ -23,7 +23,6 @@ import android.provider.Settings import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.communal.domain.interactor.communalSettingsInteractor import com.android.systemui.kosmos.testDispatcher import com.android.systemui.kosmos.testScope import com.android.systemui.kosmos.useUnconfinedTestDispatcher @@ -85,7 +84,6 @@ class KeyguardQuickAffordanceLegacySettingSyncerTest : SysuiTestCase() { .thenReturn(FakeSharedPreferences()) }, userTracker = FakeUserTracker(), - communalSettingsInteractor = kosmos.communalSettingsInteractor, broadcastDispatcher = fakeBroadcastDispatcher, ) settings.putInt(Settings.Secure.LOCKSCREEN_SHOW_CONTROLS, 0) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManagerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManagerTest.kt index bc2c2d24fd2a..15f12d7de603 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManagerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManagerTest.kt @@ -20,17 +20,13 @@ package com.android.systemui.keyguard.data.quickaffordance import android.content.Intent import android.content.SharedPreferences import android.content.pm.UserInfo -import android.platform.test.annotations.EnableFlags import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest -import com.android.systemui.Flags import com.android.systemui.SysuiTestCase import com.android.systemui.backup.BackupHelper -import com.android.systemui.communal.domain.interactor.communalSettingsInteractor import com.android.systemui.res.R import com.android.systemui.settings.FakeUserTracker import com.android.systemui.settings.UserFileManager -import com.android.systemui.testKosmos import com.android.systemui.util.FakeSharedPreferences import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat @@ -58,7 +54,6 @@ import org.mockito.MockitoAnnotations @SmallTest @RunWith(AndroidJUnit4::class) class KeyguardQuickAffordanceLocalUserSelectionManagerTest : SysuiTestCase() { - private val kosmos = testKosmos() @Mock private lateinit var userFileManager: UserFileManager @@ -85,7 +80,6 @@ class KeyguardQuickAffordanceLocalUserSelectionManagerTest : SysuiTestCase() { context = context, userFileManager = userFileManager, userTracker = userTracker, - communalSettingsInteractor = kosmos.communalSettingsInteractor, broadcastDispatcher = fakeBroadcastDispatcher, ) } @@ -315,27 +309,6 @@ class KeyguardQuickAffordanceLocalUserSelectionManagerTest : SysuiTestCase() { ) } - @EnableFlags(Flags.FLAG_GLANCEABLE_HUB_V2) - @Test - fun getSelections_returnsSelectionsIfHubV2Enabled() = runTest { - overrideResource(R.bool.custom_lockscreen_shortcuts_enabled, false) - overrideResource(com.android.internal.R.bool.config_glanceableHubEnabled, true) - - overrideResource(R.array.config_keyguardQuickAffordanceDefaults, arrayOf<String>()) - val affordanceIdsBySlotId = mutableListOf<Map<String, List<String>>>() - val job = - launch(UnconfinedTestDispatcher()) { - underTest.selections.toList(affordanceIdsBySlotId) - } - val slotId1 = "slot1" - val affordanceId1 = "affordance1" - - underTest.setSelections(slotId = slotId1, affordanceIds = listOf(affordanceId1)) - assertSelections(affordanceIdsBySlotId.last(), mapOf(slotId1 to listOf(affordanceId1))) - - job.cancel() - } - private fun assertSelections( observed: Map<String, List<String>>?, expected: Map<String, List<String>>, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt index a1018187df86..8e458a2a9525 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt @@ -22,7 +22,6 @@ import android.os.UserHandle import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.communal.domain.interactor.communalSettingsInteractor import com.android.systemui.coroutines.collectLastValue import com.android.systemui.keyguard.data.quickaffordance.FakeKeyguardQuickAffordanceConfig import com.android.systemui.keyguard.data.quickaffordance.FakeKeyguardQuickAffordanceProviderClientFactory @@ -89,7 +88,6 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() { .thenReturn(FakeSharedPreferences()) }, userTracker = userTracker, - communalSettingsInteractor = kosmos.communalSettingsInteractor, broadcastDispatcher = fakeBroadcastDispatcher, ) client1 = FakeCustomizationProviderClient() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt index 88c8b1fbb4ce..bdced7075f92 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt @@ -28,7 +28,6 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon -import com.android.systemui.communal.domain.interactor.communalSettingsInteractor import com.android.systemui.coroutines.collectLastValue import com.android.systemui.coroutines.collectValues import com.android.systemui.dock.DockManager @@ -150,7 +149,6 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { .thenReturn(FakeSharedPreferences()) }, userTracker = userTracker, - communalSettingsInteractor = kosmos.communalSettingsInteractor, broadcastDispatcher = fakeBroadcastDispatcher, ) val remoteUserSelectionManager = @@ -200,7 +198,6 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { biometricSettingsRepository = biometricSettingsRepository, backgroundDispatcher = kosmos.testDispatcher, appContext = context, - communalSettingsInteractor = kosmos.communalSettingsInteractor, accessibilityManager = accessibilityManager, sceneInteractor = { kosmos.sceneInteractor }, ) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManager.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManager.kt index 3968b49ee731..ad79177fdd76 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManager.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManager.kt @@ -24,7 +24,6 @@ import com.android.systemui.backup.BackupHelper import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow -import com.android.systemui.communal.domain.interactor.CommunalSettingsInteractor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.res.R import com.android.systemui.settings.UserFileManager @@ -49,7 +48,6 @@ constructor( @ShadeDisplayAware private val context: Context, private val userFileManager: UserFileManager, private val userTracker: UserTracker, - private val communalSettingsInteractor: CommunalSettingsInteractor, broadcastDispatcher: BroadcastDispatcher, ) : KeyguardQuickAffordanceSelectionManager { @@ -127,11 +125,7 @@ constructor( override fun getSelections(): Map<String, List<String>> { // If the custom shortcuts feature is not enabled, ignore prior selections and use defaults - // TODO(b/383391342): remove isV2FlagEnabled check and just depend on the resource - if ( - !(context.resources.getBoolean(R.bool.custom_lockscreen_shortcuts_enabled) || - communalSettingsInteractor.isV2FlagEnabled()) - ) { + if (!context.resources.getBoolean(R.bool.custom_lockscreen_shortcuts_enabled)) { return defaults } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt index 898b68d0f4b4..65ceb88ef73b 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt @@ -29,7 +29,6 @@ import com.android.internal.widget.LockPatternUtils import com.android.keyguard.logging.KeyguardQuickAffordancesLogger import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable -import com.android.systemui.communal.domain.interactor.CommunalSettingsInteractor import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.devicepolicy.areKeyguardShortcutsDisabled @@ -90,7 +89,6 @@ constructor( private val devicePolicyManager: DevicePolicyManager, private val dockManager: DockManager, private val biometricSettingsRepository: BiometricSettingsRepository, - private val communalSettingsInteractor: CommunalSettingsInteractor, private val accessibilityManager: AccessibilityManager, @Background private val backgroundDispatcher: CoroutineDispatcher, @ShadeDisplayAware private val appContext: Context, @@ -467,10 +465,7 @@ constructor( name = Contract.FlagsTable.FLAG_NAME_CUSTOM_LOCK_SCREEN_QUICK_AFFORDANCES_ENABLED, value = !isFeatureDisabledByDevicePolicy() && - // TODO(b/383391342): remove isV2FlagEnabled check once trunkfood is reached - (appContext.resources.getBoolean( - R.bool.custom_lockscreen_shortcuts_enabled - ) || communalSettingsInteractor.isV2FlagEnabled()), + appContext.resources.getBoolean(R.bool.custom_lockscreen_shortcuts_enabled), ), KeyguardPickerFlag( name = Contract.FlagsTable.FLAG_NAME_CUSTOM_CLOCKS_ENABLED, diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt index a3c3d2cdbb43..3f4170d44698 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt @@ -34,7 +34,6 @@ import com.android.keyguard.logging.KeyguardQuickAffordancesLogger import com.android.systemui.SystemUIAppComponentFactoryBase import com.android.systemui.SysuiTestCase import com.android.systemui.animation.DialogTransitionAnimator -import com.android.systemui.communal.domain.interactor.communalSettingsInteractor import com.android.systemui.dock.DockManagerFake import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags @@ -134,7 +133,6 @@ class CustomizationProviderTest : SysuiTestCase() { .thenReturn(FakeSharedPreferences()) }, userTracker = userTracker, - communalSettingsInteractor = kosmos.communalSettingsInteractor, broadcastDispatcher = fakeBroadcastDispatcher, ) val remoteUserSelectionManager = @@ -206,7 +204,6 @@ class CustomizationProviderTest : SysuiTestCase() { backgroundDispatcher = testDispatcher, appContext = mContext, accessibilityManager = mock(), - communalSettingsInteractor = kosmos.communalSettingsInteractor, sceneInteractor = { kosmos.sceneInteractor }, ) underTest.previewManager = diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt index ab691c630f97..611d176d0722 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt @@ -29,7 +29,6 @@ import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon -import com.android.systemui.communal.domain.interactor.communalSettingsInteractor import com.android.systemui.dock.DockManagerFake import com.android.systemui.flags.DisableSceneContainer import com.android.systemui.flags.FakeFeatureFlags @@ -271,7 +270,6 @@ class KeyguardQuickAffordanceInteractorParameterizedTest : SysuiTestCase() { .thenReturn(FakeSharedPreferences()) }, userTracker = userTracker, - communalSettingsInteractor = kosmos.communalSettingsInteractor, broadcastDispatcher = fakeBroadcastDispatcher, ) val remoteUserSelectionManager = @@ -321,7 +319,6 @@ class KeyguardQuickAffordanceInteractorParameterizedTest : SysuiTestCase() { backgroundDispatcher = testDispatcher, appContext = mContext, accessibilityManager = mock(), - communalSettingsInteractor = kosmos.communalSettingsInteractor, sceneInteractor = { kosmos.sceneInteractor }, ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt index caf08efc4b32..6ba683c86e1d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt @@ -30,7 +30,6 @@ import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon -import com.android.systemui.communal.domain.interactor.communalSettingsInteractor import com.android.systemui.dock.DockManagerFake import com.android.systemui.flags.EnableSceneContainer import com.android.systemui.flags.FakeFeatureFlags @@ -274,7 +273,6 @@ class KeyguardQuickAffordanceInteractorSceneContainerTest : SysuiTestCase() { .thenReturn(FakeSharedPreferences()) }, userTracker = userTracker, - communalSettingsInteractor = kosmos.communalSettingsInteractor, broadcastDispatcher = fakeBroadcastDispatcher, ) val remoteUserSelectionManager = @@ -326,7 +324,6 @@ class KeyguardQuickAffordanceInteractorSceneContainerTest : SysuiTestCase() { backgroundDispatcher = testDispatcher, appContext = mContext, accessibilityManager = mock(), - communalSettingsInteractor = kosmos.communalSettingsInteractor, sceneInteractor = { kosmos.sceneInteractor }, ) } 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 051aba3d593f..1b5a1c227c14 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 @@ -29,7 +29,6 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable import com.android.systemui.common.shared.model.Icon -import com.android.systemui.communal.domain.interactor.communalSettingsInteractor import com.android.systemui.coroutines.collectLastValue import com.android.systemui.dock.DockManagerFake import com.android.systemui.flags.Flags @@ -214,7 +213,6 @@ class KeyguardQuickAffordancesCombinedViewModelTest : SysuiTestCase() { .thenReturn(FakeSharedPreferences()) }, userTracker = userTracker, - communalSettingsInteractor = kosmos.communalSettingsInteractor, broadcastDispatcher = fakeBroadcastDispatcher, ) val remoteUserSelectionManager = @@ -295,7 +293,6 @@ class KeyguardQuickAffordancesCombinedViewModelTest : SysuiTestCase() { backgroundDispatcher = kosmos.testDispatcher, appContext = mContext, accessibilityManager = mock(), - communalSettingsInteractor = kosmos.communalSettingsInteractor, sceneInteractor = { kosmos.sceneInteractor }, ), keyguardInteractor = keyguardInteractor, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/quickaffordance/LocalUserSelectionManagerKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/quickaffordance/LocalUserSelectionManagerKosmos.kt index 328338b88638..21d1a76088fa 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/quickaffordance/LocalUserSelectionManagerKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/data/quickaffordance/LocalUserSelectionManagerKosmos.kt @@ -18,7 +18,6 @@ package com.android.systemui.keyguard.data.quickaffordance import android.content.applicationContext import com.android.systemui.broadcast.broadcastDispatcher -import com.android.systemui.communal.domain.interactor.communalSettingsInteractor import com.android.systemui.kosmos.Kosmos import com.android.systemui.settings.userFileManager import com.android.systemui.settings.userTracker @@ -29,7 +28,6 @@ val Kosmos.localUserSelectionManager by context = applicationContext, userFileManager = userFileManager, userTracker = userTracker, - communalSettingsInteractor = communalSettingsInteractor, broadcastDispatcher = broadcastDispatcher, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorKosmos.kt index ba64ed78f77c..22e76f614aad 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorKosmos.kt @@ -22,7 +22,6 @@ import android.view.accessibility.AccessibilityManager import com.android.internal.widget.lockPatternUtils import com.android.keyguard.logging.KeyguardQuickAffordancesLogger import com.android.systemui.animation.dialogTransitionAnimator -import com.android.systemui.communal.domain.interactor.communalSettingsInteractor import com.android.systemui.dock.dockManager import com.android.systemui.flags.featureFlagsClassic import com.android.systemui.keyguard.data.repository.biometricSettingsRepository @@ -54,7 +53,6 @@ var Kosmos.keyguardQuickAffordanceInteractor by Fixture { devicePolicyManager = devicePolicyManager, dockManager = dockManager, biometricSettingsRepository = biometricSettingsRepository, - communalSettingsInteractor = communalSettingsInteractor, accessibilityManager = mock<AccessibilityManager>(), backgroundDispatcher = testDispatcher, appContext = applicationContext, |