Merge "Renames customization content provider (3/7)." into tm-qpr-dev am: 31f874c1bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/20823819
Change-Id: Iaebaa589ec978bbdc667fd5ad1587c372497559c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4282a08..4e71bcc 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -10,7 +10,7 @@
<uses-permission android:name="android.permission.SET_WALLPAPER_COMPONENT" />
<uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
<uses-permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE" />
- <uses-permission android:name="android.permission.ACCESS_KEYGUARD_QUICK_AFFORDANCES" />
+ <uses-permission android:name="android.permission.CUSTOMIZE_SYSTEM_UI" />
<queries>
<!-- Specific intents Wallpaper picker query for -->
diff --git a/src/com/android/customization/model/clock/ClockSectionController.kt b/src/com/android/customization/model/clock/ClockSectionController.kt
index e81fbce..1e339bb 100644
--- a/src/com/android/customization/model/clock/ClockSectionController.kt
+++ b/src/com/android/customization/model/clock/ClockSectionController.kt
@@ -19,8 +19,8 @@
import android.view.LayoutInflater
import com.android.customization.picker.clock.ClockCustomDemoFragment
import com.android.customization.picker.clock.ClockSectionView
-import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderClient
-import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderContract as Contract
+import com.android.systemui.shared.customization.data.content.CustomizationProviderClient
+import com.android.systemui.shared.customization.data.content.CustomizationProviderContract as Contract
import com.android.wallpaper.R
import com.android.wallpaper.model.CustomizationSectionController
import com.android.wallpaper.model.CustomizationSectionController.CustomizationSectionNavigationController
@@ -29,10 +29,10 @@
/** A [CustomizationSectionController] for clock customization. */
class ClockSectionController(
private val navigationController: CustomizationSectionNavigationController,
- private val keyguardQuickAffordanceProviderClient: KeyguardQuickAffordanceProviderClient,
+ private val customizationProviderClient: CustomizationProviderClient,
) : CustomizationSectionController<ClockSectionView?> {
override fun isAvailable(context: Context?): Boolean {
- return runBlocking { keyguardQuickAffordanceProviderClient.queryFlags() }
+ return runBlocking { customizationProviderClient.queryFlags() }
.firstOrNull { it.name == Contract.FlagsTable.FLAG_NAME_CUSTOM_CLOCKS_ENABLED }
?.value == true
}
diff --git a/src/com/android/customization/module/ThemePickerInjector.java b/src/com/android/customization/module/ThemePickerInjector.java
index a33541c..fb778f1 100644
--- a/src/com/android/customization/module/ThemePickerInjector.java
+++ b/src/com/android/customization/module/ThemePickerInjector.java
@@ -37,8 +37,8 @@
import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordancePickerInteractor;
import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordanceSnapshotRestorer;
import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQuickAffordancePickerViewModel;
-import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderClient;
-import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderClientImpl;
+import com.android.systemui.shared.customization.data.content.CustomizationProviderClient;
+import com.android.systemui.shared.customization.data.content.CustomizationProviderClientImpl;
import com.android.wallpaper.config.BaseFlags;
import com.android.wallpaper.model.LiveWallpaperInfo;
import com.android.wallpaper.model.WallpaperInfo;
@@ -67,7 +67,7 @@
private KeyguardQuickAffordancePickerInteractor mKeyguardQuickAffordancePickerInteractor;
private KeyguardQuickAffordancePickerViewModel.Factory
mKeyguardQuickAffordancePickerViewModelFactory;
- private KeyguardQuickAffordanceProviderClient mKeyguardQuickAffordanceProviderClient;
+ private CustomizationProviderClient mCustomizationProviderClient;
private FragmentFactory mFragmentFactory;
private BaseFlags mFlags;
private KeyguardQuickAffordanceSnapshotRestorer mKeyguardQuickAffordanceSnapshotRestorer;
@@ -150,7 +150,7 @@
public KeyguardQuickAffordancePickerInteractor getKeyguardQuickAffordancePickerInteractor(
Context context) {
if (mKeyguardQuickAffordancePickerInteractor == null) {
- final KeyguardQuickAffordanceProviderClient client =
+ final CustomizationProviderClient client =
getKeyguardQuickAffordancePickerProviderClient(context);
mKeyguardQuickAffordancePickerInteractor = new KeyguardQuickAffordancePickerInteractor(
new KeyguardQuickAffordancePickerRepository(client, Dispatchers.getIO()),
@@ -202,15 +202,15 @@
return restorers;
}
- /** Returns the {@link KeyguardQuickAffordanceProviderClient}. */
- protected KeyguardQuickAffordanceProviderClient getKeyguardQuickAffordancePickerProviderClient(
+ /** Returns the {@link CustomizationProviderClient}. */
+ protected CustomizationProviderClient getKeyguardQuickAffordancePickerProviderClient(
Context context) {
- if (mKeyguardQuickAffordanceProviderClient == null) {
- mKeyguardQuickAffordanceProviderClient =
- new KeyguardQuickAffordanceProviderClientImpl(context, Dispatchers.getIO());
+ if (mCustomizationProviderClient == null) {
+ mCustomizationProviderClient =
+ new CustomizationProviderClientImpl(context, Dispatchers.getIO());
}
- return mKeyguardQuickAffordanceProviderClient;
+ return mCustomizationProviderClient;
}
protected KeyguardQuickAffordanceSnapshotRestorer getKeyguardQuickAffordanceSnapshotRestorer(
diff --git a/src/com/android/customization/picker/quickaffordance/data/repository/KeyguardQuickAffordancePickerRepository.kt b/src/com/android/customization/picker/quickaffordance/data/repository/KeyguardQuickAffordancePickerRepository.kt
index 0209391..fd553fe 100644
--- a/src/com/android/customization/picker/quickaffordance/data/repository/KeyguardQuickAffordancePickerRepository.kt
+++ b/src/com/android/customization/picker/quickaffordance/data/repository/KeyguardQuickAffordancePickerRepository.kt
@@ -20,8 +20,8 @@
import com.android.customization.picker.quickaffordance.shared.model.KeyguardQuickAffordancePickerAffordanceModel as AffordanceModel
import com.android.customization.picker.quickaffordance.shared.model.KeyguardQuickAffordancePickerSelectionModel as SelectionModel
import com.android.customization.picker.quickaffordance.shared.model.KeyguardQuickAffordancePickerSlotModel as SlotModel
-import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderClient as Client
-import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderContract as Contract
+import com.android.systemui.shared.customization.data.content.CustomizationProviderClient as Client
+import com.android.systemui.shared.customization.data.content.CustomizationProviderContract as Contract
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map
diff --git a/src/com/android/customization/picker/quickaffordance/domain/interactor/KeyguardQuickAffordancePickerInteractor.kt b/src/com/android/customization/picker/quickaffordance/domain/interactor/KeyguardQuickAffordancePickerInteractor.kt
index c2d2e5a..fbe303b 100644
--- a/src/com/android/customization/picker/quickaffordance/domain/interactor/KeyguardQuickAffordancePickerInteractor.kt
+++ b/src/com/android/customization/picker/quickaffordance/domain/interactor/KeyguardQuickAffordancePickerInteractor.kt
@@ -23,7 +23,7 @@
import com.android.customization.picker.quickaffordance.shared.model.KeyguardQuickAffordancePickerAffordanceModel as AffordanceModel
import com.android.customization.picker.quickaffordance.shared.model.KeyguardQuickAffordancePickerSelectionModel as SelectionModel
import com.android.customization.picker.quickaffordance.shared.model.KeyguardQuickAffordancePickerSlotModel as SlotModel
-import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderClient as Client
+import com.android.systemui.shared.customization.data.content.CustomizationProviderClient as Client
import javax.inject.Provider
import kotlinx.coroutines.flow.Flow
diff --git a/src/com/android/customization/picker/quickaffordance/domain/interactor/KeyguardQuickAffordanceSnapshotRestorer.kt b/src/com/android/customization/picker/quickaffordance/domain/interactor/KeyguardQuickAffordanceSnapshotRestorer.kt
index f0544a1..cb2dbdc 100644
--- a/src/com/android/customization/picker/quickaffordance/domain/interactor/KeyguardQuickAffordanceSnapshotRestorer.kt
+++ b/src/com/android/customization/picker/quickaffordance/domain/interactor/KeyguardQuickAffordanceSnapshotRestorer.kt
@@ -17,14 +17,14 @@
package com.android.customization.picker.quickaffordance.domain.interactor
-import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderClient
+import com.android.systemui.shared.customization.data.content.CustomizationProviderClient
import com.android.wallpaper.picker.undo.domain.interactor.SnapshotRestorer
import com.android.wallpaper.picker.undo.shared.model.RestorableSnapshot
/** Handles state restoration for the quick affordances system. */
class KeyguardQuickAffordanceSnapshotRestorer(
private val interactor: KeyguardQuickAffordancePickerInteractor,
- private val client: KeyguardQuickAffordanceProviderClient,
+ private val client: CustomizationProviderClient,
) : SnapshotRestorer {
private lateinit var snapshotUpdater: (RestorableSnapshot) -> Unit
diff --git a/src/com/android/customization/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModel.kt b/src/com/android/customization/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModel.kt
index e0e5ca8..d879045 100644
--- a/src/com/android/customization/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModel.kt
+++ b/src/com/android/customization/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModel.kt
@@ -27,8 +27,8 @@
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.viewModelScope
import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordancePickerInteractor
+import com.android.systemui.shared.customization.data.content.CustomizationProviderContract
import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots
-import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderContract as Contract
import com.android.systemui.shared.quickaffordance.shared.model.KeyguardQuickAffordancePreviewConstants
import com.android.wallpaper.R
import com.android.wallpaper.module.CurrentWallpaperInfoFactory
@@ -300,11 +300,15 @@
return null
}
- val splitUp = split(Contract.AffordanceTable.COMPONENT_NAME_SEPARATOR)
+ val splitUp =
+ split(
+ CustomizationProviderContract.LockScreenQuickAffordances.AffordanceTable
+ .COMPONENT_NAME_SEPARATOR
+ )
check(splitUp.size == 1 || splitUp.size == 2) {
"Illegal component name \"$this\". Must be either just an action or a package and an" +
" action separated by a" +
- " \"${Contract.AffordanceTable.COMPONENT_NAME_SEPARATOR}\"!"
+ " \"${CustomizationProviderContract.LockScreenQuickAffordances.AffordanceTable.COMPONENT_NAME_SEPARATOR}\"!"
}
return Intent(splitUp.last()).apply {
diff --git a/tests/src/com/android/customization/model/picker/quickaffordance/data/repository/KeyguardQuickAffordancePickerRepositoryTest.kt b/tests/src/com/android/customization/model/picker/quickaffordance/data/repository/KeyguardQuickAffordancePickerRepositoryTest.kt
index 5e4fa6e..3f22ced 100644
--- a/tests/src/com/android/customization/model/picker/quickaffordance/data/repository/KeyguardQuickAffordancePickerRepositoryTest.kt
+++ b/tests/src/com/android/customization/model/picker/quickaffordance/data/repository/KeyguardQuickAffordancePickerRepositoryTest.kt
@@ -19,7 +19,8 @@
import androidx.test.filters.SmallTest
import com.android.customization.picker.quickaffordance.data.repository.KeyguardQuickAffordancePickerRepository
-import com.android.systemui.shared.quickaffordance.data.content.FakeKeyguardQuickAffordanceProviderClient
+import com.android.systemui.shared.customization.data.content.CustomizationProviderContract
+import com.android.systemui.shared.customization.data.content.FakeCustomizationProviderClient
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -44,11 +45,11 @@
private lateinit var underTest: KeyguardQuickAffordancePickerRepository
private lateinit var testScope: TestScope
- private lateinit var client: FakeKeyguardQuickAffordanceProviderClient
+ private lateinit var client: FakeCustomizationProviderClient
@Before
fun setUp() {
- client = FakeKeyguardQuickAffordanceProviderClient()
+ client = FakeCustomizationProviderClient()
val coroutineDispatcher = UnconfinedTestDispatcher()
testScope = TestScope(coroutineDispatcher)
Dispatchers.setMain(coroutineDispatcher)
@@ -69,9 +70,7 @@
fun `isFeatureEnabled - enabled`() =
testScope.runTest {
client.setFlag(
- com.android.systemui.shared.quickaffordance.data.content
- .KeyguardQuickAffordanceProviderContract
- .FlagsTable
+ CustomizationProviderContract.FlagsTable
.FLAG_NAME_CUSTOM_LOCK_SCREEN_QUICK_AFFORDANCES_ENABLED,
true,
)
@@ -87,9 +86,7 @@
fun `isFeatureEnabled - not enabled`() =
testScope.runTest {
client.setFlag(
- com.android.systemui.shared.quickaffordance.data.content
- .KeyguardQuickAffordanceProviderContract
- .FlagsTable
+ CustomizationProviderContract.FlagsTable
.FLAG_NAME_CUSTOM_LOCK_SCREEN_QUICK_AFFORDANCES_ENABLED,
false,
)
diff --git a/tests/src/com/android/customization/model/picker/quickaffordance/domain/interactor/KeyguardQuickAffordancePickerInteractorTest.kt b/tests/src/com/android/customization/model/picker/quickaffordance/domain/interactor/KeyguardQuickAffordancePickerInteractorTest.kt
index 87f47fa..9a2a0af 100644
--- a/tests/src/com/android/customization/model/picker/quickaffordance/domain/interactor/KeyguardQuickAffordancePickerInteractorTest.kt
+++ b/tests/src/com/android/customization/model/picker/quickaffordance/domain/interactor/KeyguardQuickAffordancePickerInteractorTest.kt
@@ -22,8 +22,8 @@
import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordancePickerInteractor
import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordanceSnapshotRestorer
import com.android.customization.picker.quickaffordance.shared.model.KeyguardQuickAffordancePickerSelectionModel
+import com.android.systemui.shared.customization.data.content.FakeCustomizationProviderClient
import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots
-import com.android.systemui.shared.quickaffordance.data.content.FakeKeyguardQuickAffordanceProviderClient
import com.android.wallpaper.testing.collectLastValue
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.Dispatchers
@@ -48,14 +48,14 @@
private lateinit var underTest: KeyguardQuickAffordancePickerInteractor
private lateinit var testScope: TestScope
- private lateinit var client: FakeKeyguardQuickAffordanceProviderClient
+ private lateinit var client: FakeCustomizationProviderClient
@Before
fun setUp() {
val testDispatcher = StandardTestDispatcher()
testScope = TestScope(testDispatcher)
Dispatchers.setMain(testDispatcher)
- client = FakeKeyguardQuickAffordanceProviderClient()
+ client = FakeCustomizationProviderClient()
underTest =
KeyguardQuickAffordancePickerInteractor(
repository =
@@ -86,28 +86,28 @@
underTest.select(
slotId = KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START,
- affordanceId = FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_1,
+ affordanceId = FakeCustomizationProviderClient.AFFORDANCE_1,
)
assertThat(selections())
.isEqualTo(
listOf(
KeyguardQuickAffordancePickerSelectionModel(
slotId = KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START,
- affordanceId = FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_1,
+ affordanceId = FakeCustomizationProviderClient.AFFORDANCE_1,
),
)
)
underTest.select(
slotId = KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START,
- affordanceId = FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_2,
+ affordanceId = FakeCustomizationProviderClient.AFFORDANCE_2,
)
assertThat(selections())
.isEqualTo(
listOf(
KeyguardQuickAffordancePickerSelectionModel(
slotId = KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START,
- affordanceId = FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_2,
+ affordanceId = FakeCustomizationProviderClient.AFFORDANCE_2,
),
)
)
@@ -119,12 +119,12 @@
val selections = collectLastValue(underTest.selections)
underTest.select(
slotId = KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START,
- affordanceId = FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_1,
+ affordanceId = FakeCustomizationProviderClient.AFFORDANCE_1,
)
underTest.unselect(
slotId = KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START,
- affordanceId = FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_1,
+ affordanceId = FakeCustomizationProviderClient.AFFORDANCE_1,
)
assertThat(selections()).isEmpty()
@@ -137,15 +137,15 @@
val selections = collectLastValue(underTest.selections)
underTest.select(
slotId = KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END,
- affordanceId = FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_1,
+ affordanceId = FakeCustomizationProviderClient.AFFORDANCE_1,
)
underTest.select(
slotId = KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END,
- affordanceId = FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_2,
+ affordanceId = FakeCustomizationProviderClient.AFFORDANCE_2,
)
underTest.select(
slotId = KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END,
- affordanceId = FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_3,
+ affordanceId = FakeCustomizationProviderClient.AFFORDANCE_3,
)
underTest.unselectAll(
diff --git a/tests/src/com/android/customization/model/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModelTest.kt b/tests/src/com/android/customization/model/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModelTest.kt
index 6706f17..7a54a4b 100644
--- a/tests/src/com/android/customization/model/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModelTest.kt
+++ b/tests/src/com/android/customization/model/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModelTest.kt
@@ -27,9 +27,9 @@
import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQuickAffordanceSlotViewModel
import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQuickAffordanceSummaryViewModel
import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQuickAffordanceViewModel
+import com.android.systemui.shared.customization.data.content.CustomizationProviderClient
+import com.android.systemui.shared.customization.data.content.FakeCustomizationProviderClient
import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots
-import com.android.systemui.shared.quickaffordance.data.content.FakeKeyguardQuickAffordanceProviderClient
-import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderClient
import com.android.wallpaper.picker.undo.data.repository.UndoRepository
import com.android.wallpaper.picker.undo.domain.interactor.UndoInteractor
import com.android.wallpaper.testing.FAKE_RESTORERS
@@ -60,7 +60,7 @@
private lateinit var context: Context
private lateinit var testScope: TestScope
- private lateinit var client: FakeKeyguardQuickAffordanceProviderClient
+ private lateinit var client: FakeCustomizationProviderClient
private lateinit var quickAffordanceInteractor: KeyguardQuickAffordancePickerInteractor
@Before
@@ -69,7 +69,7 @@
val testDispatcher = StandardTestDispatcher()
testScope = TestScope(testDispatcher)
Dispatchers.setMain(testDispatcher)
- client = FakeKeyguardQuickAffordanceProviderClient()
+ client = FakeCustomizationProviderClient()
quickAffordanceInteractor =
KeyguardQuickAffordancePickerInteractor(
@@ -136,14 +136,14 @@
slots = slots(),
affordances = quickAffordances(),
selectedSlotText = "Left button",
- selectedAffordanceText = FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_1,
+ selectedAffordanceText = FakeCustomizationProviderClient.AFFORDANCE_1,
)
assertPreviewUiState(
slots = slots(),
expectedAffordanceNameBySlotId =
mapOf(
KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START to
- FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_1,
+ FakeCustomizationProviderClient.AFFORDANCE_1,
KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END to null,
),
)
@@ -157,16 +157,16 @@
slots = slots(),
affordances = quickAffordances(),
selectedSlotText = "Right button",
- selectedAffordanceText = FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_3,
+ selectedAffordanceText = FakeCustomizationProviderClient.AFFORDANCE_3,
)
assertPreviewUiState(
slots = slots(),
expectedAffordanceNameBySlotId =
mapOf(
KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START to
- FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_1,
+ FakeCustomizationProviderClient.AFFORDANCE_1,
KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END to
- FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_3,
+ FakeCustomizationProviderClient.AFFORDANCE_3,
),
)
@@ -176,16 +176,16 @@
slots = slots(),
affordances = quickAffordances(),
selectedSlotText = "Right button",
- selectedAffordanceText = FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_2,
+ selectedAffordanceText = FakeCustomizationProviderClient.AFFORDANCE_2,
)
assertPreviewUiState(
slots = slots(),
expectedAffordanceNameBySlotId =
mapOf(
KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START to
- FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_1,
+ FakeCustomizationProviderClient.AFFORDANCE_1,
KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END to
- FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_2,
+ FakeCustomizationProviderClient.AFFORDANCE_2,
),
)
}
@@ -221,7 +221,7 @@
mapOf(
KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START to null,
KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END to
- FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_3,
+ FakeCustomizationProviderClient.AFFORDANCE_3,
),
)
}
@@ -241,7 +241,7 @@
// Lets add a disabled affordance to the picker:
val affordanceIndex =
client.addAffordance(
- KeyguardQuickAffordanceProviderClient.Affordance(
+ CustomizationProviderClient.Affordance(
id = "disabled",
name = "disabled",
iconResourceId = 1,
@@ -256,7 +256,7 @@
quickAffordances()?.get(affordanceIndex + 1)?.onClicked?.invoke()
// We expect there to be a dialog that should be shown:
- assertThat(dialog()?.icon).isEqualTo(FakeKeyguardQuickAffordanceProviderClient.ICON_1)
+ assertThat(dialog()?.icon).isEqualTo(FakeCustomizationProviderClient.ICON_1)
assertThat(dialog()?.instructions).isEqualTo(enablementInstructions)
assertThat(dialog()?.actionText).isEqualTo(enablementActionText)
assertThat(dialog()?.intent?.`package`).isEqualTo(packageName)
@@ -288,10 +288,10 @@
.isEqualTo(
KeyguardQuickAffordanceSummaryViewModel(
description =
- "${FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_1}," +
- " ${FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_3}",
- icon1 = FakeKeyguardQuickAffordanceProviderClient.ICON_1,
- icon2 = FakeKeyguardQuickAffordanceProviderClient.ICON_3,
+ "${FakeCustomizationProviderClient.AFFORDANCE_1}," +
+ " ${FakeCustomizationProviderClient.AFFORDANCE_3}",
+ icon1 = FakeCustomizationProviderClient.ICON_1,
+ icon2 = FakeCustomizationProviderClient.ICON_3,
)
)
}
@@ -309,8 +309,8 @@
assertThat(summary())
.isEqualTo(
KeyguardQuickAffordanceSummaryViewModel(
- description = FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_1,
- icon1 = FakeKeyguardQuickAffordanceProviderClient.ICON_1,
+ description = FakeCustomizationProviderClient.AFFORDANCE_1,
+ icon1 = FakeCustomizationProviderClient.ICON_1,
icon2 = null,
)
)
@@ -332,9 +332,9 @@
assertThat(summary())
.isEqualTo(
KeyguardQuickAffordanceSummaryViewModel(
- description = FakeKeyguardQuickAffordanceProviderClient.AFFORDANCE_3,
+ description = FakeCustomizationProviderClient.AFFORDANCE_3,
icon1 = null,
- icon2 = FakeKeyguardQuickAffordanceProviderClient.ICON_3,
+ icon2 = FakeCustomizationProviderClient.ICON_3,
)
)
}
@@ -413,8 +413,7 @@
*
* @param slots The observed slot view-models, keyed by slot ID
* @param expectedAffordanceNameBySlotId The expected name of the selected affordance for each
- * slot ID or `null` if it's expected for there to be no affordance for that slot in the
- * preview
+ * slot ID or `null` if it's expected for there to be no affordance for that slot in the preview
*/
private fun assertPreviewUiState(
slots: Map<String, KeyguardQuickAffordanceSlotViewModel>?,
diff --git a/tests/src/com/android/customization/testing/TestCustomizationInjector.java b/tests/src/com/android/customization/testing/TestCustomizationInjector.java
index f4a659c..d609335 100644
--- a/tests/src/com/android/customization/testing/TestCustomizationInjector.java
+++ b/tests/src/com/android/customization/testing/TestCustomizationInjector.java
@@ -13,8 +13,8 @@
import com.android.customization.picker.quickaffordance.data.repository.KeyguardQuickAffordancePickerRepository;
import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordancePickerInteractor;
import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordanceSnapshotRestorer;
-import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderClient;
-import com.android.systemui.shared.quickaffordance.data.content.KeyguardQuickAffordanceProviderClientImpl;
+import com.android.systemui.shared.customization.data.content.CustomizationProviderClient;
+import com.android.systemui.shared.customization.data.content.CustomizationProviderClientImpl;
import com.android.wallpaper.config.BaseFlags;
import com.android.wallpaper.module.DrawableLayerResolver;
import com.android.wallpaper.module.PackageStatusNotifier;
@@ -38,7 +38,7 @@
private UserEventLogger mUserEventLogger;
private KeyguardQuickAffordancePickerInteractor mKeyguardQuickAffordancePickerInteractor;
private BaseFlags mFlags;
- private KeyguardQuickAffordanceProviderClient mKeyguardQuickAffordanceProviderClient;
+ private CustomizationProviderClient mCustomizationProviderClient;
private KeyguardQuickAffordanceSnapshotRestorer mKeyguardQuickAffordanceSnapshotRestorer;
@Override
@@ -89,8 +89,8 @@
public KeyguardQuickAffordancePickerInteractor getKeyguardQuickAffordancePickerInteractor(
Context context) {
if (mKeyguardQuickAffordancePickerInteractor == null) {
- final KeyguardQuickAffordanceProviderClient client =
- new KeyguardQuickAffordanceProviderClientImpl(context, Dispatchers.getIO());
+ final CustomizationProviderClient client =
+ new CustomizationProviderClientImpl(context, Dispatchers.getIO());
mKeyguardQuickAffordancePickerInteractor = new KeyguardQuickAffordancePickerInteractor(
new KeyguardQuickAffordancePickerRepository(client, Dispatchers.getIO()),
client,
@@ -117,15 +117,15 @@
return restorers;
}
- /** Returns the {@link KeyguardQuickAffordanceProviderClient}. */
- private KeyguardQuickAffordanceProviderClient getKeyguardQuickAffordancePickerProviderClient(
+ /** Returns the {@link CustomizationProviderClient}. */
+ private CustomizationProviderClient getKeyguardQuickAffordancePickerProviderClient(
Context context) {
- if (mKeyguardQuickAffordanceProviderClient == null) {
- mKeyguardQuickAffordanceProviderClient =
- new KeyguardQuickAffordanceProviderClientImpl(context, Dispatchers.getIO());
+ if (mCustomizationProviderClient == null) {
+ mCustomizationProviderClient =
+ new CustomizationProviderClientImpl(context, Dispatchers.getIO());
}
- return mKeyguardQuickAffordanceProviderClient;
+ return mCustomizationProviderClient;
}
private KeyguardQuickAffordanceSnapshotRestorer getKeyguardQuickAffordanceSnapshotRestorer(