Colors floating sheet (1/2)
Test: Manually tested.
Bug: 350718581
Flag: com.android.wallpaper.new_picker_ui_flag
Change-Id: I1208c83954d53f2a9a4bc3c64868af10ea88790c
diff --git a/res/drawable/ic_colors.xml b/res/drawable/ic_colors.xml
new file mode 100644
index 0000000..31bf4d9
--- /dev/null
+++ b/res/drawable/ic_colors.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ ~ Copyright (C) 2024 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~
+ -->
+
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M346,820L100,574Q90,564 85,552Q80,540 80,527Q80,514 85,502Q90,490 100,480L330,251L224,145L286,80L686,480Q696,490 700.5,502Q705,514 705,527Q705,540 700.5,552Q696,564 686,574L440,820Q430,830 418,835Q406,840 393,840Q380,840 368,835Q356,830 346,820ZM393,314L179,528Q179,528 179,528Q179,528 179,528L607,528Q607,528 607,528Q607,528 607,528L393,314ZM792,840Q756,840 731,814.5Q706,789 706,752Q706,725 719.5,701Q733,677 750,654L792,600L836,654Q852,677 866,701Q880,725 880,752Q880,789 854,814.5Q828,840 792,840Z"/>
+</vector>
\ No newline at end of file
diff --git a/res/layout/floating_sheet_colors.xml b/res/layout/floating_sheet_colors.xml
new file mode 100644
index 0000000..8e6ed64
--- /dev/null
+++ b/res/layout/floating_sheet_colors.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ ~ Copyright (C) 2024 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingHorizontal="@dimen/floating_sheet_horizontal_padding"
+ android:orientation="vertical"
+ android:clipToPadding="false"
+ android:clipChildren="false">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/floating_sheet_content_background"
+ android:paddingVertical="@dimen/floating_sheet_list_vertical_padding"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/color_type_tab_subhead"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="16dp"
+ android:layout_marginHorizontal="20dp"
+ android:gravity="center"
+ android:text="@string/wallpaper_color_subheader"
+ android:textColor="@color/system_on_surface"
+ android:textSize="12sp" />
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/colors_horizontal_list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="12dp"
+ android:clipChildren="false"
+ android:clipToPadding="false" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:clickable="true"
+ android:gravity="center_vertical"
+ android:layout_marginHorizontal="20dp"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/dark_mode_toggle_title"
+ style="@style/SectionTitleTextStyle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/mode_title" />
+
+ <Switch
+ android:id="@+id/dark_mode_toggle"
+ style="@style/Switch.SettingsLib"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:clickable="false"
+ android:focusable="false"
+ android:minHeight="0dp" />
+ </LinearLayout>
+ </LinearLayout>
+
+ <com.android.wallpaper.picker.customization.ui.view.FloatingTabToolbar
+ android:id="@+id/floating_bar_tabs"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginVertical="@dimen/floating_sheet_tab_toolbar_vertical_margin" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/floating_sheet_shortcut.xml b/res/layout/floating_sheet_shortcut.xml
index 0c5c1eb..44a9b6d 100644
--- a/res/layout/floating_sheet_shortcut.xml
+++ b/res/layout/floating_sheet_shortcut.xml
@@ -17,7 +17,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingHorizontal="@dimen/shortcut_floating_sheet_horizontal_padding"
+ android:paddingHorizontal="@dimen/floating_sheet_horizontal_padding"
android:paddingBottom="16dp"
android:orientation="vertical"
android:clipToPadding="false"
@@ -26,7 +26,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingVertical="@dimen/shortcut_floating_sheet_list_vertical_padding"
+ android:paddingVertical="@dimen/floating_sheet_list_vertical_padding"
android:background="@drawable/floating_sheet_content_background"
android:clipToPadding="false"
android:clipChildren="false">
@@ -44,5 +44,5 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:layout_marginVertical="@dimen/shortcut_floating_sheet_tab_toolbar_vertical_margin" />
+ android:layout_marginVertical="@dimen/floating_sheet_tab_toolbar_vertical_margin" />
</LinearLayout>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2d6fedd..a643c0a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -175,8 +175,8 @@
<!-- Notification item dimensions -->
<dimen name="notification_section_title_padding">8dp</dimen>
- <!-- Shortcut floating sheet dimensions -->
- <dimen name="shortcut_floating_sheet_list_vertical_padding">20dp</dimen>
- <dimen name="shortcut_floating_sheet_horizontal_padding">16dp</dimen>
- <dimen name="shortcut_floating_sheet_tab_toolbar_vertical_margin">8dp</dimen>
+ <!-- Floating sheet dimensions -->
+ <dimen name="floating_sheet_list_vertical_padding">20dp</dimen>
+ <dimen name="floating_sheet_horizontal_padding">16dp</dimen>
+ <dimen name="floating_sheet_tab_toolbar_vertical_margin">8dp</dimen>
</resources>
diff --git a/src/com/android/customization/module/CustomizationInjector.kt b/src/com/android/customization/module/CustomizationInjector.kt
index 75ebca8..2696b97 100644
--- a/src/com/android/customization/module/CustomizationInjector.kt
+++ b/src/com/android/customization/module/CustomizationInjector.kt
@@ -39,10 +39,7 @@
fun getClockPickerInteractor(context: Context): ClockPickerInteractor
- fun getColorPickerViewModelFactory(
- context: Context,
- wallpaperColorsRepository: WallpaperColorsRepository,
- ): ColorPickerViewModel.Factory
+ fun getColorPickerViewModelFactory(context: Context): ColorPickerViewModel.Factory
fun getClockCarouselViewModelFactory(
interactor: ClockPickerInteractor,
diff --git a/src/com/android/customization/module/ThemePickerInjector.kt b/src/com/android/customization/module/ThemePickerInjector.kt
index c71374d..c08c4e5 100644
--- a/src/com/android/customization/module/ThemePickerInjector.kt
+++ b/src/com/android/customization/module/ThemePickerInjector.kt
@@ -134,10 +134,7 @@
val resources = activity.resources
return customizationSections
?: DefaultCustomizationSections(
- getColorPickerViewModelFactory(
- context = appContext,
- wallpaperColorsRepository = getWallpaperColorsRepository(),
- ),
+ getColorPickerViewModelFactory(appContext),
getKeyguardQuickAffordancePickerViewModelFactory(appContext),
colorContrastSectionViewModelFactory.get(),
getNotificationSectionViewModelFactory(appContext),
@@ -373,10 +370,7 @@
return ThemedWallpaperColorResources(wallpaperColors, getSecureSettingsRepository(context))
}
- override fun getColorPickerViewModelFactory(
- context: Context,
- wallpaperColorsRepository: WallpaperColorsRepository,
- ): ColorPickerViewModel.Factory {
+ override fun getColorPickerViewModelFactory(context: Context): ColorPickerViewModel.Factory {
return colorPickerViewModelFactory
?: ColorPickerViewModel.Factory(
context.applicationContext,
diff --git a/src/com/android/customization/picker/color/ui/binder/ColorPickerBinder.kt b/src/com/android/customization/picker/color/ui/binder/ColorPickerBinder.kt
index 7b5b598..05e42c9 100644
--- a/src/com/android/customization/picker/color/ui/binder/ColorPickerBinder.kt
+++ b/src/com/android/customization/picker/color/ui/binder/ColorPickerBinder.kt
@@ -133,9 +133,10 @@
interface Binding {
fun saveInstanceState(savedState: Bundle)
+
fun restoreInstanceState(savedState: Bundle)
}
- private val LAYOUT_MANAGER_SAVED_STATE: String = "layout_manager_state"
+ private const val LAYOUT_MANAGER_SAVED_STATE: String = "layout_manager_state"
private var layoutManagerSavedState: Parcelable? = null
}
diff --git a/src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt b/src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt
index a2dc526..c5eb76f 100644
--- a/src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt
+++ b/src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt
@@ -85,10 +85,7 @@
viewModel =
ViewModelProvider(
requireActivity(),
- injector.getColorPickerViewModelFactory(
- context = requireContext(),
- wallpaperColorsRepository = wallpaperColorsRepository,
- ),
+ injector.getColorPickerViewModelFactory(requireContext()),
)
.get(),
lifecycleOwner = this,
diff --git a/src/com/android/customization/picker/common/ui/view/KeyguardQuickAffordanceItemSpacing.kt b/src/com/android/customization/picker/common/ui/view/DoubleRowListItemSpacing.kt
similarity index 89%
rename from src/com/android/customization/picker/common/ui/view/KeyguardQuickAffordanceItemSpacing.kt
rename to src/com/android/customization/picker/common/ui/view/DoubleRowListItemSpacing.kt
index c88a819..746061c 100644
--- a/src/com/android/customization/picker/common/ui/view/KeyguardQuickAffordanceItemSpacing.kt
+++ b/src/com/android/customization/picker/common/ui/view/DoubleRowListItemSpacing.kt
@@ -19,13 +19,13 @@
import android.view.View
import androidx.recyclerview.widget.RecyclerView
-/** Item spacing used by the RecyclerView. */
-class KeyguardQuickAffordanceItemSpacing() : RecyclerView.ItemDecoration() {
+/** Item spacing used by the RecyclerView with 2 rows. */
+class DoubleRowListItemSpacing(private val rowSpaceDp: Int) : RecyclerView.ItemDecoration() {
override fun getItemOffsets(
outRect: Rect,
view: View,
parent: RecyclerView,
- state: RecyclerView.State
+ state: RecyclerView.State,
) {
val itemIndex = parent.getChildAdapterPosition(view)
val columnIndex = itemIndex / 2
@@ -62,7 +62,7 @@
}
if (itemIndex % 2 == 0) {
- outRect.bottom = FIRST_ROW_BOTTOM_SPACING_DP.toPx(density)
+ outRect.bottom = rowSpaceDp.toPx(density)
}
}
@@ -72,7 +72,6 @@
companion object {
const val EDGE_ITEM_HORIZONTAL_SPACING_DP = 20
- const val COMMON_HORIZONTAL_SPACING_DP = 9
- const val FIRST_ROW_BOTTOM_SPACING_DP = 8
+ const val COMMON_HORIZONTAL_SPACING_DP = 4
}
}
diff --git a/src/com/android/wallpaper/customization/ui/binder/ColorsFloatingSheetBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ColorsFloatingSheetBinder.kt
new file mode 100644
index 0000000..82f5291
--- /dev/null
+++ b/src/com/android/wallpaper/customization/ui/binder/ColorsFloatingSheetBinder.kt
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.wallpaper.customization.ui.binder
+
+import android.content.Context
+import android.content.res.Configuration.UI_MODE_NIGHT_MASK
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import android.view.View
+import android.widget.TextView
+import androidx.core.content.res.ResourcesCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.android.customization.picker.color.shared.model.ColorType
+import com.android.customization.picker.color.ui.binder.ColorOptionIconBinder
+import com.android.customization.picker.color.ui.view.ColorOptionIconView
+import com.android.customization.picker.color.ui.viewmodel.ColorOptionIconViewModel
+import com.android.customization.picker.color.ui.viewmodel.ColorTypeTabViewModel
+import com.android.customization.picker.common.ui.view.DoubleRowListItemSpacing
+import com.android.themepicker.R
+import com.android.wallpaper.customization.ui.viewmodel.ColorPickerViewModel2
+import com.android.wallpaper.picker.customization.ui.view.FloatingTabToolbar
+import com.android.wallpaper.picker.customization.ui.view.FloatingTabToolbar.Tab.PRIMARY
+import com.android.wallpaper.picker.customization.ui.view.FloatingTabToolbar.Tab.SECONDARY
+import com.android.wallpaper.picker.option.ui.adapter.OptionItemAdapter
+import kotlinx.coroutines.launch
+
+object ColorsFloatingSheetBinder {
+
+ fun bind(
+ view: View,
+ viewModel: ColorPickerViewModel2,
+ lifecycleOwner: LifecycleOwner,
+ ) {
+ val subhead = view.requireViewById<TextView>(R.id.color_type_tab_subhead)
+
+ val colorsAdapter =
+ createOptionItemAdapter(view.resources.configuration.uiMode, lifecycleOwner)
+ val colorsList =
+ view.requireViewById<RecyclerView>(R.id.colors_horizontal_list).also {
+ it.initColorsList(view.context.applicationContext, colorsAdapter)
+ }
+
+ val tabs = view.requireViewById<FloatingTabToolbar>(R.id.floating_bar_tabs)
+
+ lifecycleOwner.lifecycleScope.launch {
+ lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+ launch {
+ viewModel.colorTypeTabs.collect { colorTypes ->
+ colorTypes.forEach { (colorType, tabViewModel) ->
+ bindTab(tabs, colorType, tabViewModel)
+ }
+ colorTypes
+ .filterValues { it.isSelected }
+ .keys
+ .firstOrNull()
+ ?.let {
+ when (it) {
+ ColorType.WALLPAPER_COLOR -> tabs.setTabSelected(PRIMARY)
+ ColorType.PRESET_COLOR -> tabs.setTabSelected(SECONDARY)
+ }
+ }
+ }
+ }
+
+ launch { viewModel.colorTypeTabSubheader.collect { subhead.text = it } }
+
+ launch {
+ viewModel.colorOptions.collect { colorOptions ->
+ colorsAdapter.setItems(colorOptions) {
+ var indexToFocus = colorOptions.indexOfFirst { it.isSelected.value }
+ indexToFocus = if (indexToFocus < 0) 0 else indexToFocus
+ (colorsList.layoutManager as LinearLayoutManager)
+ .scrollToPositionWithOffset(indexToFocus, 0)
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private fun createOptionItemAdapter(
+ uiMode: Int,
+ lifecycleOwner: LifecycleOwner
+ ): OptionItemAdapter<ColorOptionIconViewModel> =
+ OptionItemAdapter(
+ layoutResourceId = R.layout.color_option,
+ lifecycleOwner = lifecycleOwner,
+ bindIcon = { foregroundView: View, colorIcon: ColorOptionIconViewModel ->
+ val colorOptionIconView = foregroundView as? ColorOptionIconView
+ val night = uiMode and UI_MODE_NIGHT_MASK == UI_MODE_NIGHT_YES
+ colorOptionIconView?.let { ColorOptionIconBinder.bind(it, colorIcon, night) }
+ }
+ )
+
+ private fun RecyclerView.initColorsList(
+ context: Context,
+ adapter: OptionItemAdapter<ColorOptionIconViewModel>,
+ ) {
+ apply {
+ this.adapter = adapter
+ layoutManager =
+ GridLayoutManager(
+ context,
+ 2,
+ GridLayoutManager.HORIZONTAL,
+ false,
+ )
+ addItemDecoration(DoubleRowListItemSpacing(4))
+ }
+ }
+
+ private fun bindTab(
+ tabs: FloatingTabToolbar,
+ colorType: ColorType,
+ viewModel: ColorTypeTabViewModel
+ ) {
+ val tab =
+ when (colorType) {
+ ColorType.WALLPAPER_COLOR -> PRIMARY
+ ColorType.PRESET_COLOR -> SECONDARY
+ }
+ val iconDrawable =
+ ResourcesCompat.getDrawable(
+ tabs.resources,
+ when (colorType) {
+ ColorType.WALLPAPER_COLOR ->
+ com.android.wallpaper.R.drawable.ic_baseline_wallpaper_24
+ ColorType.PRESET_COLOR -> R.drawable.ic_colors
+ },
+ null,
+ )
+ when (colorType) {
+ ColorType.WALLPAPER_COLOR -> tabs.primaryIcon.setImageDrawable(iconDrawable)
+ ColorType.PRESET_COLOR -> tabs.secondaryIcon.setImageDrawable(iconDrawable)
+ }
+ tabs.setTabText(tab, viewModel.name)
+ tabs.setOnTabClick(tab, viewModel.onClick)
+ }
+}
diff --git a/src/com/android/wallpaper/customization/ui/binder/ShortcutFloatingSheetBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ShortcutFloatingSheetBinder.kt
index 962278a..6fc1b7f 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ShortcutFloatingSheetBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ShortcutFloatingSheetBinder.kt
@@ -26,7 +26,7 @@
import androidx.lifecycle.repeatOnLifecycle
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import com.android.customization.picker.common.ui.view.KeyguardQuickAffordanceItemSpacing
+import com.android.customization.picker.common.ui.view.DoubleRowListItemSpacing
import com.android.themepicker.R
import com.android.wallpaper.customization.ui.viewmodel.KeyguardQuickAffordancePickerViewModel2
import com.android.wallpaper.picker.common.dialog.ui.viewbinder.DialogViewBinder
@@ -184,7 +184,7 @@
GridLayoutManager.HORIZONTAL,
false,
)
- addItemDecoration(KeyguardQuickAffordanceItemSpacing())
+ addItemDecoration(DoubleRowListItemSpacing(12))
}
}
diff --git a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
index 0fa1283..250c3d1 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
@@ -21,6 +21,7 @@
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
+import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerHomeCustomizationOption
import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerLockCustomizationOption
import com.android.wallpaper.customization.ui.viewmodel.ThemePickerCustomizationOptionsViewModel
import com.android.wallpaper.picker.customization.ui.binder.CustomizationOptionsBinder
@@ -62,6 +63,10 @@
lockScreenCustomizationOptionEntries
.find { it.first == ThemePickerLockCustomizationOption.SHORTCUTS }
?.second
+ val optionColors =
+ homeScreenCustomizationOptionEntries
+ .find { it.first == ThemePickerHomeCustomizationOption.COLORS }
+ ?.second
viewModel as ThemePickerCustomizationOptionsViewModel
lifecycleOwner.lifecycleScope.launch {
@@ -77,6 +82,12 @@
optionShortcut?.setOnClickListener { _ -> it?.invoke() }
}
}
+
+ launch {
+ viewModel.onCustomizeColorsClicked.collect {
+ optionColors?.setOnClickListener { _ -> it?.invoke() }
+ }
+ }
}
}
@@ -85,5 +96,11 @@
viewModel.keyguardQuickAffordancePickerViewModel2,
lifecycleOwner,
)
+
+ ColorsFloatingSheetBinder.bind(
+ view,
+ viewModel.colorPickerViewModel2,
+ lifecycleOwner,
+ )
}
}
diff --git a/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt b/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
index 83c4154..5e7f568 100644
--- a/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
+++ b/src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt
@@ -162,17 +162,27 @@
)
.also { bottomSheetContainer.addView(it) }
)
+ put(
+ ThemePickerHomeCustomizationOption.COLORS,
+ inflateFloatingSheet(
+ ThemePickerHomeCustomizationOption.COLORS,
+ bottomSheetContainer,
+ layoutInflater,
+ )
+ .also { bottomSheetContainer.addView(it) }
+ )
}
}
private fun inflateFloatingSheet(
- option: ThemePickerLockCustomizationOption,
+ option: CustomizationOptionUtil.CustomizationOption,
bottomSheetContainer: FrameLayout,
layoutInflater: LayoutInflater,
): View =
when (option) {
ThemePickerLockCustomizationOption.CLOCK -> R.layout.floating_sheet_clock
ThemePickerLockCustomizationOption.SHORTCUTS -> R.layout.floating_sheet_shortcut
+ ThemePickerHomeCustomizationOption.COLORS -> R.layout.floating_sheet_colors
else ->
throw IllegalStateException(
"Customization option $option does not have a bottom sheet view"
diff --git a/tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt b/tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt
index c0a7c83..c0ae6f0 100644
--- a/tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt
+++ b/tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt
@@ -57,10 +57,7 @@
throw UnsupportedOperationException("not implemented")
}
- override fun getColorPickerViewModelFactory(
- context: Context,
- wallpaperColorsRepository: WallpaperColorsRepository,
- ): ColorPickerViewModel.Factory {
+ override fun getColorPickerViewModelFactory(context: Context): ColorPickerViewModel.Factory {
throw UnsupportedOperationException("not implemented")
}