Rename app_shape_and_grid to app_shape_grid
This makes the name less lengthy
Test: Manually tested the app works the same
Bug: 362237825
Flag: com.android.systemui.shared.new_customization_picker_ui
Change-Id: I08f5beff9c032b5ad32958acb717e2bff466da66
diff --git a/res/layout/customization_option_entry_app_shape_and_grid.xml b/res/layout/customization_option_entry_app_shape_grid.xml
similarity index 90%
rename from res/layout/customization_option_entry_app_shape_and_grid.xml
rename to res/layout/customization_option_entry_app_shape_grid.xml
index ea6da46..8d18e7c 100644
--- a/res/layout/customization_option_entry_app_shape_and_grid.xml
+++ b/res/layout/customization_option_entry_app_shape_grid.xml
@@ -24,20 +24,20 @@
android:clickable="true">
<TextView
- android:id="@+id/option_entry_app_grid_title"
+ android:id="@+id/option_entry_app_shape_grid_title"
style="@style/CustomizationOptionEntryTitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:text="@string/grid_title"
+ android:text="@string/shape_and_grid_title"
android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/option_entry_app_grid_icon_container"
- app:layout_constraintBottom_toTopOf="@+id/option_entry_app_grid_description"
+ app:layout_constraintBottom_toTopOf="@+id/option_entry_app_shape_grid_description"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
- android:id="@+id/option_entry_app_grid_description"
+ android:id="@+id/option_entry_app_shape_grid_description"
style="@style/CustomizationOptionEntrySubtitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/option_entry_app_grid_icon_container"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/option_entry_app_grid_title" />
+ app:layout_constraintTop_toBottomOf="@+id/option_entry_app_shape_grid_title" />
<FrameLayout
android:id="@+id/option_entry_app_grid_icon_container"
@@ -58,7 +58,7 @@
app:layout_constraintBottom_toBottomOf="parent">
<ImageView
- android:id="@+id/option_entry_app_grid_icon"
+ android:id="@+id/option_entry_app_shape_grid_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/grid_preview_card_content_description" />
diff --git a/res/layout/floating_sheet_shape_and_grid.xml b/res/layout/floating_sheet_shape_grid.xml
similarity index 100%
rename from res/layout/floating_sheet_shape_and_grid.xml
rename to res/layout/floating_sheet_shape_grid.xml
diff --git a/res/values/strings.xml b/res/values/strings.xml
index aee2393..cc6ce20 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -100,6 +100,10 @@
the home screen. [CHAR LIMIT=15] -->
<string name="grid_title">App grid</string>
+ <!-- Title of a section of the customization picker where the user can select app shapes and
+ grid layouts for the home screen. [CHAR LIMIT=15] -->
+ <string name="shape_and_grid_title">App shape & layout</string>
+
<!-- Label for a button that allows the user to apply the currently selected Theme.
[CHAR LIMIT=20] -->
<string name="apply_theme_btn">Apply</string>
diff --git a/src/com/android/wallpaper/customization/ui/binder/ShapeAndGridFloatingSheetBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ShapeGridFloatingSheetBinder.kt
similarity index 91%
rename from src/com/android/wallpaper/customization/ui/binder/ShapeAndGridFloatingSheetBinder.kt
rename to src/com/android/wallpaper/customization/ui/binder/ShapeGridFloatingSheetBinder.kt
index 7217f61..2fafd41 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ShapeAndGridFloatingSheetBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ShapeGridFloatingSheetBinder.kt
@@ -29,17 +29,17 @@
import com.android.customization.picker.grid.ui.binder.GridIconViewBinder
import com.android.customization.picker.grid.ui.viewmodel.GridIconViewModel
import com.android.wallpaper.R
-import com.android.wallpaper.customization.ui.viewmodel.ShapeAndGridPickerViewModel
+import com.android.wallpaper.customization.ui.viewmodel.ShapeGridPickerViewModel
import com.android.wallpaper.picker.option.ui.adapter.OptionItemAdapter
import com.android.wallpaper.picker.option.ui.binder.OptionItemBinder
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.launch
-object ShapeAndGridFloatingSheetBinder {
+object ShapeGridFloatingSheetBinder {
fun bind(
view: View,
- viewModel: ShapeAndGridPickerViewModel,
+ viewModel: ShapeGridPickerViewModel,
lifecycleOwner: LifecycleOwner,
backgroundDispatcher: CoroutineDispatcher,
) {
@@ -83,7 +83,7 @@
bindIcon = { foregroundView: View, gridIcon: GridIconViewModel ->
val imageView = foregroundView as? ImageView
imageView?.let { GridIconViewBinder.bind(imageView, gridIcon) }
- }
+ },
)
private fun RecyclerView.initGridOptionList(
@@ -91,12 +91,7 @@
adapter: OptionItemAdapter<GridIconViewModel>,
) {
apply {
- this.layoutManager =
- LinearLayoutManager(
- context,
- RecyclerView.HORIZONTAL,
- false,
- )
+ this.layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
addItemDecoration(
SingleRowListItemSpacing(
edgeItemSpacePx =
diff --git a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
index 0740158..7792734 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
@@ -104,14 +104,14 @@
.find { it.first == ThemePickerHomeCustomizationOption.COLORS }
?.second
- val optionShapeAndGrid =
+ val optionShapeGrid =
homeScreenCustomizationOptionEntries
- .find { it.first == ThemePickerHomeCustomizationOption.APP_SHAPE_AND_GRID }
+ .find { it.first == ThemePickerHomeCustomizationOption.APP_SHAPE_GRID }
?.second
- val optionShapeAndGridDescription =
- optionShapeAndGrid?.findViewById<TextView>(R.id.option_entry_app_grid_description)
- val optionShapeAndGridIcon =
- optionShapeAndGrid?.findViewById<ImageView>(R.id.option_entry_app_grid_icon)
+ val optionShapeGridDescription =
+ optionShapeGrid?.findViewById<TextView>(R.id.option_entry_app_shape_grid_description)
+ val optionShapeGridIcon =
+ optionShapeGrid?.findViewById<ImageView>(R.id.option_entry_app_shape_grid_icon)
val optionsViewModel =
viewModel.customizationOptionsViewModel as ThemePickerCustomizationOptionsViewModel
@@ -158,23 +158,21 @@
}
launch {
- optionsViewModel.onCustomizeShapeAndGridClicked.collect {
- optionShapeAndGrid?.setOnClickListener { _ -> it?.invoke() }
+ optionsViewModel.onCustomizeShapeGridClicked.collect {
+ optionShapeGrid?.setOnClickListener { _ -> it?.invoke() }
}
}
launch {
- optionsViewModel.shapeAndGridPickerViewModel.selectedGridOption.collect {
+ optionsViewModel.shapeGridPickerViewModel.selectedGridOption.collect {
gridOption ->
- optionShapeAndGridDescription?.let {
- TextViewBinder.bind(it, gridOption.text)
- }
+ optionShapeGridDescription?.let { TextViewBinder.bind(it, gridOption.text) }
gridOption.payload?.let { gridIconViewModel ->
- optionShapeAndGridIcon?.let {
+ optionShapeGridIcon?.let {
GridIconViewBinder.bind(view = it, viewModel = gridIconViewModel)
}
// TODO(b/363018910): Use ColorUpdateBinder to update color
- optionShapeAndGridIcon?.setColorFilter(
+ optionShapeGridIcon?.setColorFilter(
ContextCompat.getColor(
view.context,
com.android.wallpaper.R.color.system_on_surface_variant,
@@ -220,11 +218,11 @@
}
customizationOptionFloatingSheetViewMap
- ?.get(ThemePickerHomeCustomizationOption.APP_SHAPE_AND_GRID)
+ ?.get(ThemePickerHomeCustomizationOption.APP_SHAPE_GRID)
?.let {
- ShapeAndGridFloatingSheetBinder.bind(
+ ShapeGridFloatingSheetBinder.bind(
it,
- optionsViewModel.shapeAndGridPickerViewModel,
+ optionsViewModel.shapeGridPickerViewModel,
lifecycleOwner,
Dispatchers.IO,
)
diff --git a/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt b/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
index 6789e2b..6006327 100644
--- a/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
+++ b/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
@@ -49,7 +49,7 @@
enum class ThemePickerHomeCustomizationOption : CustomizationOptionUtil.CustomizationOption {
COLORS,
- APP_SHAPE_AND_GRID,
+ APP_SHAPE_GRID,
THEMED_ICONS,
}
@@ -109,9 +109,9 @@
)
)
add(
- ThemePickerHomeCustomizationOption.APP_SHAPE_AND_GRID to
+ ThemePickerHomeCustomizationOption.APP_SHAPE_GRID to
layoutInflater.inflate(
- R.layout.customization_option_entry_app_shape_and_grid,
+ R.layout.customization_option_entry_app_shape_grid,
optionContainer,
false,
)
@@ -164,9 +164,9 @@
.also { bottomSheetContainer.addView(it) },
)
put(
- ThemePickerHomeCustomizationOption.APP_SHAPE_AND_GRID,
+ ThemePickerHomeCustomizationOption.APP_SHAPE_GRID,
inflateFloatingSheet(
- ThemePickerHomeCustomizationOption.APP_SHAPE_AND_GRID,
+ ThemePickerHomeCustomizationOption.APP_SHAPE_GRID,
bottomSheetContainer,
layoutInflater,
)
@@ -193,8 +193,7 @@
ThemePickerLockCustomizationOption.CLOCK -> R.layout.floating_sheet_clock
ThemePickerLockCustomizationOption.SHORTCUTS -> R.layout.floating_sheet_shortcut
ThemePickerHomeCustomizationOption.COLORS -> R.layout.floating_sheet_colors
- ThemePickerHomeCustomizationOption.APP_SHAPE_AND_GRID ->
- R.layout.floating_sheet_shape_and_grid
+ ThemePickerHomeCustomizationOption.APP_SHAPE_GRID -> R.layout.floating_sheet_shape_grid
else ->
throw IllegalStateException(
"Customization option $option does not have a bottom sheet view"
diff --git a/src/com/android/wallpaper/customization/ui/viewmodel/ShapeAndGridPickerViewModel.kt b/src/com/android/wallpaper/customization/ui/viewmodel/ShapeGridPickerViewModel.kt
similarity index 97%
rename from src/com/android/wallpaper/customization/ui/viewmodel/ShapeAndGridPickerViewModel.kt
rename to src/com/android/wallpaper/customization/ui/viewmodel/ShapeGridPickerViewModel.kt
index f319c04..78b01af 100644
--- a/src/com/android/wallpaper/customization/ui/viewmodel/ShapeAndGridPickerViewModel.kt
+++ b/src/com/android/wallpaper/customization/ui/viewmodel/ShapeGridPickerViewModel.kt
@@ -39,7 +39,7 @@
import kotlinx.coroutines.flow.shareIn
import kotlinx.coroutines.flow.stateIn
-class ShapeAndGridPickerViewModel
+class ShapeGridPickerViewModel
@AssistedInject
constructor(
@ApplicationContext private val context: Context,
@@ -123,6 +123,6 @@
@ViewModelScoped
@AssistedFactory
interface Factory {
- fun create(viewModelScope: CoroutineScope): ShapeAndGridPickerViewModel
+ fun create(viewModelScope: CoroutineScope): ShapeGridPickerViewModel
}
}
diff --git a/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt b/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt
index 4707f81..d54fd59 100644
--- a/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt
+++ b/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt
@@ -43,7 +43,7 @@
keyguardQuickAffordancePickerViewModel2Factory: KeyguardQuickAffordancePickerViewModel2.Factory,
colorPickerViewModel2Factory: ColorPickerViewModel2.Factory,
clockPickerViewModelFactory: ClockPickerViewModel.Factory,
- shapeAndGridPickerViewModelFactory: ShapeAndGridPickerViewModel.Factory,
+ shapeGridPickerViewModelFactory: ShapeGridPickerViewModel.Factory,
val darkModeViewModel: DarkModeViewModel,
@Assisted private val viewModelScope: CoroutineScope,
) : CustomizationOptionsViewModel {
@@ -55,14 +55,14 @@
val keyguardQuickAffordancePickerViewModel2 =
keyguardQuickAffordancePickerViewModel2Factory.create(viewModelScope = viewModelScope)
val colorPickerViewModel2 = colorPickerViewModel2Factory.create(viewModelScope = viewModelScope)
- val shapeAndGridPickerViewModel =
- shapeAndGridPickerViewModelFactory.create(viewModelScope = viewModelScope)
+ val shapeGridPickerViewModel =
+ shapeGridPickerViewModelFactory.create(viewModelScope = viewModelScope)
override val selectedOption = defaultCustomizationOptionsViewModel.selectedOption
override fun deselectOption(): Boolean {
keyguardQuickAffordancePickerViewModel2.resetPreview()
- shapeAndGridPickerViewModel.resetPreview()
+ shapeGridPickerViewModel.resetPreview()
clockPickerViewModel.resetPreview()
colorPickerViewModel2.resetPreview()
darkModeViewModel.resetPreview()
@@ -109,13 +109,13 @@
}
}
- val onCustomizeShapeAndGridClicked: Flow<(() -> Unit)?> =
+ val onCustomizeShapeGridClicked: Flow<(() -> Unit)?> =
selectedOption.map {
if (it == null) {
{
defaultCustomizationOptionsViewModel.selectOption(
ThemePickerCustomizationOptionUtil.ThemePickerHomeCustomizationOption
- .APP_SHAPE_AND_GRID
+ .APP_SHAPE_GRID
)
}
} else {
@@ -133,7 +133,7 @@
ThemePickerCustomizationOptionUtil.ThemePickerLockCustomizationOption
.SHORTCUTS -> keyguardQuickAffordancePickerViewModel2.onApply
ThemePickerCustomizationOptionUtil.ThemePickerHomeCustomizationOption
- .APP_SHAPE_AND_GRID -> shapeAndGridPickerViewModel.onApply
+ .APP_SHAPE_GRID -> shapeGridPickerViewModel.onApply
ThemePickerCustomizationOptionUtil.ThemePickerHomeCustomizationOption.COLORS ->
combine(colorPickerViewModel2.onApply, darkModeViewModel.onApply) {
colorOnApply,
diff --git a/src/com/android/wallpaper/picker/common/preview/ui/binder/ThemePickerWorkspaceCallbackBinder.kt b/src/com/android/wallpaper/picker/common/preview/ui/binder/ThemePickerWorkspaceCallbackBinder.kt
index b9cc997..fd82710 100644
--- a/src/com/android/wallpaper/picker/common/preview/ui/binder/ThemePickerWorkspaceCallbackBinder.kt
+++ b/src/com/android/wallpaper/picker/common/preview/ui/binder/ThemePickerWorkspaceCallbackBinder.kt
@@ -139,7 +139,7 @@
lifecycleOwner.lifecycleScope.launch {
lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
launch {
- viewModel.shapeAndGridPickerViewModel.previewingGridOptionKey.collect {
+ viewModel.shapeGridPickerViewModel.previewingGridOptionKey.collect {
workspaceCallback.sendMessage(
MESSAGE_ID_UPDATE_GRID,
bundleOf(KEY_GRID_NAME to it),
diff --git a/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ShapeAndGridPickerViewModelTest.kt b/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ShapeGridPickerViewModelTest.kt
similarity index 97%
rename from tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ShapeAndGridPickerViewModelTest.kt
rename to tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ShapeGridPickerViewModelTest.kt
index af9bc4e..dd88134 100644
--- a/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ShapeAndGridPickerViewModelTest.kt
+++ b/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ShapeGridPickerViewModelTest.kt
@@ -48,7 +48,7 @@
@OptIn(ExperimentalCoroutinesApi::class)
@SmallTest
@RunWith(RobolectricTestRunner::class)
-class ShapeAndGridPickerViewModelTest {
+class ShapeGridPickerViewModelTest {
@get:Rule var hiltRule = HiltAndroidRule(this)
@Inject lateinit var testScope: TestScope
@@ -68,12 +68,12 @@
)
)
- private lateinit var underTest: ShapeAndGridPickerViewModel
+ private lateinit var underTest: ShapeGridPickerViewModel
@Before
fun setUp() {
hiltRule.inject()
- underTest = ShapeAndGridPickerViewModel(appContext, interactor, testScope.backgroundScope)
+ underTest = ShapeGridPickerViewModel(appContext, interactor, testScope.backgroundScope)
}
@After