Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 724fd7a9 authored by Catherine Liang's avatar Catherine Liang Committed by Android (Google) Code Review
Browse files

Merge "Clean up after Icons floating sheet change" into main

parents d1093bfc 6f7c54f1

src/com/android/wallpaper/customization/ui/binder/ShapeGridFloatingSheetBinder.kt→src/com/android/wallpaper/customization/ui/binder/GridFloatingSheetBinder.kt

+2 −3
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ import java.lang.ref.WeakReference 
import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.launch



// TODO (b/402161932): rename shape grid classes and clean up view model and below

object ShapeGridFloatingSheetBinder {

object GridFloatingSheetBinder {



    fun bind(

        view: View,
@@ -49,7 +48,7 @@ object ShapeGridFloatingSheetBinder { 
        lifecycleOwner: LifecycleOwner,

        backgroundDispatcher: CoroutineDispatcher,

    ) {

        val viewModel = optionsViewModel.fridPickerViewModel

        val viewModel = optionsViewModel.gridPickerViewModel

        val isFloatingSheetActive = { optionsViewModel.selectedOption.value == GRID }



        val floatingSheetContainer =

src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt

+2 −2
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ constructor(private val defaultCustomizationOptionsBinder: DefaultCustomizationO 
                    }



                    launch {

                        optionsViewModel.fridPickerViewModel.selectedGridOption.collect { gridOption

                        optionsViewModel.gridPickerViewModel.selectedGridOption.collect { gridOption

                            ->

                            optionGridDescription?.let { TextViewBinder.bind(it, gridOption.text) }

                            gridOption.payload?.let { optionGridIcon?.setImageDrawable(it) }
@@ -491,7 +491,7 @@ constructor(private val defaultCustomizationOptionsBinder: DefaultCustomizationO 
            }



        customizationOptionFloatingSheetViewMap?.get(ThemePickerHomeCustomizationOption.GRID)?.let {

            ShapeGridFloatingSheetBinder.bind(

            GridFloatingSheetBinder.bind(

                it,

                optionsViewModel,

                colorUpdateViewModel,

src/com/android/wallpaper/customization/ui/binder/ThemePickerToolbarBinder.kt

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ constructor(private val defaultToolbarBinder: DefaultToolbarBinder) : ToolbarBin 
                        val stringResId =

                            when (it) {

                                COLORS -> ThemePickerR.string.system_colors_title

                                GRID -> ThemePickerR.string.shape_and_grid_title

                                GRID -> ThemePickerR.string.grid_layout

                                CLOCK -> ThemePickerR.string.clock_title

                                SHORTCUTS ->

                                    ThemePickerR.string.keyguard_quick_affordance_section_title