diff options
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/customization/model/color/ColorOptionImpl.kt | 2 | ||||
-rw-r--r-- | src/com/android/customization/module/DefaultCustomizationSections.java | 4 | ||||
-rw-r--r-- | src/com/android/customization/picker/color/ui/binder/ColorPickerBinder.kt | 2 | ||||
-rw-r--r-- | src/com/android/customization/picker/color/ui/section/ColorSectionController.kt (renamed from src/com/android/customization/picker/color/ui/section/ColorSectionController2.kt) | 14 | ||||
-rw-r--r-- | src/com/android/customization/picker/color/ui/view/ColorSectionView.kt (renamed from src/com/android/customization/picker/color/ui/view/ColorSectionView2.kt) | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/com/android/customization/model/color/ColorOptionImpl.kt b/src/com/android/customization/model/color/ColorOptionImpl.kt index b559e35b..3273ce26 100644 --- a/src/com/android/customization/model/color/ColorOptionImpl.kt +++ b/src/com/android/customization/model/color/ColorOptionImpl.kt @@ -53,7 +53,7 @@ class ColorOptionImpl( } override fun getLayoutResId(): Int { - return R.layout.color_option_2 + return R.layout.color_option } override fun getPreviewInfo(): PreviewInfo { diff --git a/src/com/android/customization/module/DefaultCustomizationSections.java b/src/com/android/customization/module/DefaultCustomizationSections.java index bbe6bef1..33c32424 100644 --- a/src/com/android/customization/module/DefaultCustomizationSections.java +++ b/src/com/android/customization/module/DefaultCustomizationSections.java @@ -18,7 +18,7 @@ import com.android.customization.model.themedicon.domain.interactor.ThemedIconSn import com.android.customization.picker.clock.ui.view.ClockViewFactory; import com.android.customization.picker.clock.ui.viewmodel.ClockCarouselViewModel; import com.android.customization.picker.color.domain.interactor.ColorPickerInteractor; -import com.android.customization.picker.color.ui.section.ColorSectionController2; +import com.android.customization.picker.color.ui.section.ColorSectionController; import com.android.customization.picker.color.ui.viewmodel.ColorPickerViewModel; import com.android.customization.picker.notifications.ui.section.NotificationSectionController; import com.android.customization.picker.notifications.ui.viewmodel.NotificationSectionViewModel; @@ -144,7 +144,7 @@ public final class DefaultCustomizationSections implements CustomizationSections sectionControllers.add( new ConnectedSectionController( // Theme color section. - new ColorSectionController2( + new ColorSectionController( sectionNavigationController, new ViewModelProvider( activity, 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 cd9dd540..bd203b15 100644 --- a/src/com/android/customization/picker/color/ui/binder/ColorPickerBinder.kt +++ b/src/com/android/customization/picker/color/ui/binder/ColorPickerBinder.kt @@ -62,7 +62,7 @@ object ColorPickerBinder { colorTypeTabView.addItemDecoration(ItemSpacing(ItemSpacing.TAB_ITEM_SPACING_DP)) val colorOptionAdapter = OptionItemAdapter( - layoutResourceId = R.layout.color_option_2, + layoutResourceId = R.layout.color_option, lifecycleOwner = lifecycleOwner, bindIcon = { foregroundView: View, colorIcon: ColorOptionIconViewModel -> val colorOptionIconView = foregroundView as? ColorOptionIconView diff --git a/src/com/android/customization/picker/color/ui/section/ColorSectionController2.kt b/src/com/android/customization/picker/color/ui/section/ColorSectionController.kt index f1c982b4..a36fd80a 100644 --- a/src/com/android/customization/picker/color/ui/section/ColorSectionController2.kt +++ b/src/com/android/customization/picker/color/ui/section/ColorSectionController.kt @@ -22,37 +22,37 @@ import android.view.LayoutInflater import androidx.lifecycle.LifecycleOwner import com.android.customization.picker.color.ui.binder.ColorSectionViewBinder import com.android.customization.picker.color.ui.fragment.ColorPickerFragment -import com.android.customization.picker.color.ui.view.ColorSectionView2 +import com.android.customization.picker.color.ui.view.ColorSectionView import com.android.customization.picker.color.ui.viewmodel.ColorPickerViewModel import com.android.wallpaper.R import com.android.wallpaper.model.CustomizationSectionController import com.android.wallpaper.model.CustomizationSectionController.CustomizationSectionNavigationController as NavigationController -class ColorSectionController2( +class ColorSectionController( private val navigationController: NavigationController, private val viewModel: ColorPickerViewModel, private val lifecycleOwner: LifecycleOwner -) : CustomizationSectionController<ColorSectionView2> { +) : CustomizationSectionController<ColorSectionView> { override fun isAvailable(context: Context): Boolean { return true } - override fun createView(context: Context): ColorSectionView2 { + override fun createView(context: Context): ColorSectionView { return createView(context, CustomizationSectionController.ViewCreationParams()) } override fun createView( context: Context, params: CustomizationSectionController.ViewCreationParams - ): ColorSectionView2 { + ): ColorSectionView { @SuppressWarnings("It is fine to inflate with null parent for our need.") val view = LayoutInflater.from(context) .inflate( - R.layout.color_section_view2, + R.layout.color_section_view, null, - ) as ColorSectionView2 + ) as ColorSectionView ColorSectionViewBinder.bind( view = view, viewModel = viewModel, diff --git a/src/com/android/customization/picker/color/ui/view/ColorSectionView2.kt b/src/com/android/customization/picker/color/ui/view/ColorSectionView.kt index 7a8f21af..a89292d8 100644 --- a/src/com/android/customization/picker/color/ui/view/ColorSectionView2.kt +++ b/src/com/android/customization/picker/color/ui/view/ColorSectionView.kt @@ -23,4 +23,4 @@ import com.android.wallpaper.picker.SectionView * The class inherits from {@link SectionView} as the view representing the color section of the * customization picker. It displays a list of color options and an overflow option. */ -class ColorSectionView2(context: Context, attrs: AttributeSet?) : SectionView(context, attrs) +class ColorSectionView(context: Context, attrs: AttributeSet?) : SectionView(context, attrs) |