Merge "Revert "Enable lockscreen shortcuts when hub V2 flag is enabled"" into main (5bf5afe0) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLegacySettingSyncerTest.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -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)

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManagerTest.kt

+0 −27

Original line number	Diff line number	Diff line
		@@ -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>>,

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -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()

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -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 },
		)

packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManager.kt

+1 −7

Original line number	Diff line number	Diff line
		@@ -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
		}