Merge "Tool bar title updates wiht the selected option" into main
diff --git a/src/com/android/wallpaper/customization/ui/binder/ThemePickerToolbarBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ThemePickerToolbarBinder.kt
index c17775a..e35e473 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ThemePickerToolbarBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ThemePickerToolbarBinder.kt
@@ -28,6 +28,12 @@
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
+import com.android.themepicker.R as ThemePickerR
+import com.android.wallpaper.R
+import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerHomeCustomizationOption.APP_SHAPE_GRID
+import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerHomeCustomizationOption.COLORS
+import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerLockCustomizationOption.CLOCK
+import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerLockCustomizationOption.SHORTCUTS
import com.android.wallpaper.customization.ui.viewmodel.ThemePickerCustomizationOptionsViewModel
import com.android.wallpaper.customization.ui.viewmodel.ToolbarHeightsViewModel
import com.android.wallpaper.picker.customization.ui.binder.ColorUpdateBinder
@@ -160,6 +166,21 @@
}
launch {
+ viewModel.selectedOption.collect {
+ val stringResId =
+ when (it) {
+ COLORS -> ThemePickerR.string.color_picker_title
+ APP_SHAPE_GRID -> ThemePickerR.string.shape_and_grid_title
+ CLOCK -> ThemePickerR.string.custom_clocks_label
+ SHORTCUTS ->
+ ThemePickerR.string.keyguard_quick_affordance_section_title
+ else -> R.string.app_name
+ }
+ toolbar.title = toolbar.resources.getString(stringResId)
+ }
+ }
+
+ launch {
combine(toolbarHeights, viewModel.isToolbarCollapsed, ::Pair).collect {
(toolbarHeights, isToolbarCollapsed) ->
val (navButtonHeight, toolbarHeight, applyButtonHeight) = toolbarHeights