diff options
Diffstat (limited to 'src/com/android/customization')
40 files changed, 118 insertions, 73 deletions
diff --git a/src/com/android/customization/model/ResourceConstants.java b/src/com/android/customization/model/ResourceConstants.java index aaee9352..c1cff13b 100644 --- a/src/com/android/customization/model/ResourceConstants.java +++ b/src/com/android/customization/model/ResourceConstants.java @@ -19,7 +19,7 @@ import android.content.Context; import android.content.res.Resources; import android.provider.Settings.Secure; -import com.android.wallpaper.R; +import com.android.themepicker.R; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/customization/model/color/ColorCustomizationManager.java b/src/com/android/customization/model/color/ColorCustomizationManager.java index a09efd26..5bd302ba 100644 --- a/src/com/android/customization/model/color/ColorCustomizationManager.java +++ b/src/com/android/customization/model/color/ColorCustomizationManager.java @@ -48,7 +48,7 @@ import com.android.customization.model.ResourceConstants; import com.android.customization.model.color.ColorOptionsProvider.ColorSource; import com.android.customization.model.theme.OverlayManagerCompat; import com.android.customization.module.logging.ThemesUserEventLogger; -import com.android.wallpaper.R; +import com.android.themepicker.R; import org.json.JSONArray; import org.json.JSONException; diff --git a/src/com/android/customization/model/color/ColorOption.java b/src/com/android/customization/model/color/ColorOption.java index f57aa860..ae695dd8 100644 --- a/src/com/android/customization/model/color/ColorOption.java +++ b/src/com/android/customization/model/color/ColorOption.java @@ -30,7 +30,7 @@ import com.android.customization.model.CustomizationOption; import com.android.customization.model.color.ColorOptionsProvider.ColorSource; import com.android.customization.module.logging.ThemesUserEventLogger; import com.android.systemui.monet.Style; -import com.android.wallpaper.R; +import com.android.themepicker.R; import org.json.JSONException; import org.json.JSONObject; diff --git a/src/com/android/customization/model/color/ColorOptionImpl.kt b/src/com/android/customization/model/color/ColorOptionImpl.kt index f0905283..ecef2a71 100644 --- a/src/com/android/customization/model/color/ColorOptionImpl.kt +++ b/src/com/android/customization/model/color/ColorOptionImpl.kt @@ -23,7 +23,7 @@ import androidx.annotation.ColorInt import com.android.customization.model.color.ColorOptionsProvider.ColorSource import com.android.customization.picker.color.shared.model.ColorType import com.android.systemui.monet.Style -import com.android.wallpaper.R +import com.android.themepicker.R /** * Represents a color option in the revamped UI, it can be used for both wallpaper and preset colors diff --git a/src/com/android/customization/model/color/ColorProvider.kt b/src/com/android/customization/model/color/ColorProvider.kt index 6fdfd2ca..79925d80 100644 --- a/src/com/android/customization/model/color/ColorProvider.kt +++ b/src/com/android/customization/model/color/ColorProvider.kt @@ -38,7 +38,7 @@ import com.android.customization.model.color.ColorUtils.toColorString import com.android.customization.picker.color.shared.model.ColorType import com.android.systemui.monet.ColorScheme import com.android.systemui.monet.Style -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.module.InjectorProvider import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/src/com/android/customization/model/grid/GridOption.java b/src/com/android/customization/model/grid/GridOption.java index 347929c4..b3503514 100644 --- a/src/com/android/customization/model/grid/GridOption.java +++ b/src/com/android/customization/model/grid/GridOption.java @@ -26,7 +26,7 @@ import androidx.annotation.Nullable; import com.android.customization.model.CustomizationManager; import com.android.customization.model.CustomizationOption; import com.android.customization.widget.GridTileDrawable; -import com.android.wallpaper.R; +import com.android.themepicker.R; /** * Represents a grid layout option available in the current launcher. diff --git a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java index e71cca9f..33ad81d4 100644 --- a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java +++ b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java @@ -32,7 +32,7 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import com.android.customization.model.ResourceConstants; -import com.android.wallpaper.R; +import com.android.themepicker.R; import com.android.wallpaper.config.BaseFlags; import com.android.wallpaper.util.PreviewUtils; diff --git a/src/com/android/customization/model/mode/DarkModeSectionController.java b/src/com/android/customization/model/mode/DarkModeSectionController.java index 71398297..3da7ae9a 100644 --- a/src/com/android/customization/model/mode/DarkModeSectionController.java +++ b/src/com/android/customization/model/mode/DarkModeSectionController.java @@ -41,7 +41,7 @@ import androidx.lifecycle.OnLifecycleEvent; import com.android.customization.module.logging.ThemesUserEventLogger; import com.android.customization.picker.mode.DarkModeSectionView; -import com.android.wallpaper.R; +import com.android.themepicker.R; import com.android.wallpaper.model.CustomizationSectionController; import java.util.concurrent.ExecutorService; diff --git a/src/com/android/customization/model/themedicon/ThemedIconSectionController.java b/src/com/android/customization/model/themedicon/ThemedIconSectionController.java index 1cc6d0a5..4b3f2f5c 100644 --- a/src/com/android/customization/model/themedicon/ThemedIconSectionController.java +++ b/src/com/android/customization/model/themedicon/ThemedIconSectionController.java @@ -26,7 +26,7 @@ import com.android.customization.model.themedicon.domain.interactor.ThemedIconIn import com.android.customization.model.themedicon.domain.interactor.ThemedIconSnapshotRestorer; import com.android.customization.module.logging.ThemesUserEventLogger; import com.android.customization.picker.themedicon.ThemedIconSectionView; -import com.android.wallpaper.R; +import com.android.themepicker.R; import com.android.wallpaper.model.CustomizationSectionController; // TODO (b/311712452): Refactor CustomizationSectionController to use recommended arch UI components diff --git a/src/com/android/customization/model/themedicon/ThemedIconSwitchProvider.java b/src/com/android/customization/model/themedicon/ThemedIconSwitchProvider.java index 5e2a60a1..6b8deaa9 100644 --- a/src/com/android/customization/model/themedicon/ThemedIconSwitchProvider.java +++ b/src/com/android/customization/model/themedicon/ThemedIconSwitchProvider.java @@ -25,7 +25,7 @@ import android.os.Looper; import androidx.annotation.Nullable; import com.android.customization.module.CustomizationPreferences; -import com.android.wallpaper.R; +import com.android.themepicker.R; import com.android.wallpaper.module.InjectorProvider; import java.util.concurrent.ExecutorService; diff --git a/src/com/android/customization/picker/clock/ui/adapter/ClockSettingsTabAdapter.kt b/src/com/android/customization/picker/clock/ui/adapter/ClockSettingsTabAdapter.kt index 981a8e84..1dccb212 100644 --- a/src/com/android/customization/picker/clock/ui/adapter/ClockSettingsTabAdapter.kt +++ b/src/com/android/customization/picker/clock/ui/adapter/ClockSettingsTabAdapter.kt @@ -22,7 +22,7 @@ import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsTabViewModel -import com.android.wallpaper.R +import com.android.themepicker.R /** Adapter for the tab recycler view on the clock settings screen. */ class ClockSettingsTabAdapter : RecyclerView.Adapter<ClockSettingsTabAdapter.ViewHolder>() { diff --git a/src/com/android/customization/picker/clock/ui/binder/CarouselAccessibilityDelegate.kt b/src/com/android/customization/picker/clock/ui/binder/CarouselAccessibilityDelegate.kt index eb111717..1026f193 100644 --- a/src/com/android/customization/picker/clock/ui/binder/CarouselAccessibilityDelegate.kt +++ b/src/com/android/customization/picker/clock/ui/binder/CarouselAccessibilityDelegate.kt @@ -21,7 +21,7 @@ import android.content.Context import android.os.Bundle import android.view.View import android.view.accessibility.AccessibilityNodeInfo -import com.android.wallpaper.R +import com.android.themepicker.R class CarouselAccessibilityDelegate( private val context: Context, diff --git a/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt b/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt index d17cdf8a..b1bd0ef2 100644 --- a/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt +++ b/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt @@ -46,7 +46,7 @@ import com.android.customization.picker.clock.ui.view.ClockViewFactory import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsViewModel import com.android.customization.picker.color.ui.binder.ColorOptionIconBinder import com.android.customization.picker.common.ui.view.ItemSpacing -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.picker.option.ui.binder.OptionItemBinder import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.mapNotNull diff --git a/src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt b/src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt index dc70633e..b8bd2f3a 100644 --- a/src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt +++ b/src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt @@ -29,7 +29,7 @@ import androidx.transition.doOnStart import com.android.customization.module.ThemePickerInjector import com.android.customization.picker.clock.ui.binder.ClockSettingsBinder import com.android.systemui.shared.clocks.shared.model.ClockPreviewConstants -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.module.CustomizationSections import com.android.wallpaper.module.InjectorProvider import com.android.wallpaper.picker.AppbarFragment @@ -80,7 +80,8 @@ class ClockSettingsFragment : AppbarFragment() { context = context, authority = resources.getString( - R.string.lock_screen_preview_provider_authority, + com.android.wallpaper.R.string + .lock_screen_preview_provider_authority, ), ), wallpaperInfoProvider = { forceReload -> @@ -148,6 +149,9 @@ class ClockSettingsFragment : AppbarFragment() { } override fun getToolbarTextColor(): Int { - return ContextCompat.getColor(requireContext(), R.color.system_on_surface) + return ContextCompat.getColor( + requireContext(), + com.android.wallpaper.R.color.system_on_surface + ) } } diff --git a/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt b/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt index cae4e06b..d0a30a4c 100644 --- a/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt +++ b/src/com/android/customization/picker/clock/ui/view/ClockCarouselView.kt @@ -32,7 +32,7 @@ import androidx.core.view.isNotEmpty import com.android.customization.picker.clock.shared.ClockSize import com.android.customization.picker.clock.ui.viewmodel.ClockCarouselItemViewModel import com.android.systemui.plugins.clocks.ClockController -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.picker.FixedWidthDisplayRatioFrameLayout import java.lang.Float.max @@ -334,7 +334,7 @@ class ClockCarouselView( private fun overrideScreenPreviewWidth() { val overrideWidth = context.resources.getDimensionPixelSize( - R.dimen.screen_preview_width_for_2_pane_small_width + com.android.wallpaper.R.dimen.screen_preview_width_for_2_pane_small_width ) itemViewIds.forEach { id -> val itemView = motionLayout.requireViewById<FrameLayout>(id) @@ -361,13 +361,17 @@ class ClockCarouselView( val layout = constraint.layout if ( constraint.layout.mWidth == - context.resources.getDimensionPixelSize(R.dimen.screen_preview_width) + context.resources.getDimensionPixelSize( + com.android.wallpaper.R.dimen.screen_preview_width + ) ) { layout.mWidth = overrideWidth } if ( constraint.layout.widthMax == - context.resources.getDimensionPixelSize(R.dimen.screen_preview_width) + context.resources.getDimensionPixelSize( + com.android.wallpaper.R.dimen.screen_preview_width + ) ) { layout.widthMax = overrideWidth } diff --git a/src/com/android/customization/picker/clock/ui/view/ClockViewFactoryImpl.kt b/src/com/android/customization/picker/clock/ui/view/ClockViewFactoryImpl.kt index 5caea58d..cf9e2477 100644 --- a/src/com/android/customization/picker/clock/ui/view/ClockViewFactoryImpl.kt +++ b/src/com/android/customization/picker/clock/ui/view/ClockViewFactoryImpl.kt @@ -29,7 +29,7 @@ import androidx.lifecycle.LifecycleOwner import com.android.systemui.plugins.clocks.ClockController import com.android.systemui.plugins.clocks.WeatherData import com.android.systemui.shared.clocks.ClockRegistry -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.util.TimeUtils.TimeTicker import java.util.concurrent.ConcurrentHashMap @@ -86,7 +86,9 @@ class ClockViewFactoryImpl( val layoutParams = FrameLayout.LayoutParams( FrameLayout.LayoutParams.WRAP_CONTENT, - resources.getDimensionPixelSize(R.dimen.small_clock_height) + resources.getDimensionPixelSize( + com.android.systemui.customization.R.dimen.small_clock_height + ) ) layoutParams.topMargin = getSmallClockTopMargin() layoutParams.marginStart = getSmallClockStartPadding() @@ -97,10 +99,14 @@ class ClockViewFactoryImpl( private fun getSmallClockTopMargin() = getStatusBarHeight(appContext.resources) + - appContext.resources.getDimensionPixelSize(R.dimen.small_clock_padding_top) + appContext.resources.getDimensionPixelSize( + com.android.systemui.customization.R.dimen.small_clock_padding_top + ) private fun getSmallClockStartPadding() = - appContext.resources.getDimensionPixelSize(R.dimen.clock_padding_start) + appContext.resources.getDimensionPixelSize( + com.android.systemui.customization.R.dimen.clock_padding_start + ) override fun updateColorForAllClocks(@ColorInt seedColor: Int?) { clockControllers.values.forEach { it.events.onSeedColorChanged(seedColor = seedColor) } @@ -169,14 +175,22 @@ class ClockViewFactoryImpl( // Initialize large clock controller.largeClock.events.onRegionDarknessChanged(isWallpaperDark) controller.largeClock.events.onFontSettingChanged( - resources.getDimensionPixelSize(R.dimen.large_clock_text_size).toFloat() + resources + .getDimensionPixelSize( + com.android.systemui.customization.R.dimen.large_clock_text_size + ) + .toFloat() ) controller.largeClock.events.onTargetRegionChanged(getLargeClockRegion()) // Initialize small clock controller.smallClock.events.onRegionDarknessChanged(isWallpaperDark) controller.smallClock.events.onFontSettingChanged( - resources.getDimensionPixelSize(R.dimen.small_clock_text_size).toFloat() + resources + .getDimensionPixelSize( + com.android.systemui.customization.R.dimen.small_clock_text_size + ) + .toFloat() ) controller.smallClock.events.onTargetRegionChanged(getSmallClockRegion()) @@ -204,8 +218,13 @@ class ClockViewFactoryImpl( */ private fun getLargeClockRegion(): Rect { val largeClockTopMargin = - resources.getDimensionPixelSize(R.dimen.keyguard_large_clock_top_margin) - val targetHeight = resources.getDimensionPixelSize(R.dimen.large_clock_text_size) * 2 + resources.getDimensionPixelSize( + com.android.systemui.customization.R.dimen.keyguard_large_clock_top_margin + ) + val targetHeight = + resources.getDimensionPixelSize( + com.android.systemui.customization.R.dimen.large_clock_text_size + ) * 2 val top = (screenSize.y / 2 - targetHeight / 2 + largeClockTopMargin / 2) return Rect(0, top, screenSize.x, (top + targetHeight)) } @@ -217,7 +236,10 @@ class ClockViewFactoryImpl( */ private fun getSmallClockRegion(): Rect { val topMargin = getSmallClockTopMargin() - val targetHeight = resources.getDimensionPixelSize(R.dimen.small_clock_height) + val targetHeight = + resources.getDimensionPixelSize( + com.android.systemui.customization.R.dimen.small_clock_height + ) return Rect(getSmallClockStartPadding(), topMargin, screenSize.x, topMargin + targetHeight) } diff --git a/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModel.kt b/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModel.kt index 08e7bbe9..28f58c4f 100644 --- a/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModel.kt +++ b/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModel.kt @@ -24,7 +24,7 @@ import com.android.customization.module.logging.ThemesUserEventLogger import com.android.customization.picker.clock.domain.interactor.ClockPickerInteractor import com.android.customization.picker.clock.shared.ClockSize import com.android.customization.picker.clock.ui.view.ClockViewFactory -import com.android.wallpaper.R +import com.android.themepicker.R import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.Job @@ -83,24 +83,24 @@ class ClockCarouselViewModel( if (seedColor == null) { if (isDarkThemeEnabled) { // In dark mode, use darkest surface container color - R.color.system_surface_container_high + com.android.wallpaper.R.color.system_surface_container_high } else { // In light mode, use lightest surface container color - R.color.system_surface_bright + com.android.wallpaper.R.color.system_surface_bright } } else { val luminance = Color.luminance(seedColor) if (isDarkThemeEnabled) { if (luminance <= CARD_COLOR_CHANGE_LUMINANCE_THRESHOLD_DARK_THEME) { - R.color.system_surface_bright + com.android.wallpaper.R.color.system_surface_bright } else { - R.color.system_surface_container_high + com.android.wallpaper.R.color.system_surface_container_high } } else { if (luminance <= CARD_COLOR_CHANGE_LUMINANCE_THRESHOLD_LIGHT_THEME) { - R.color.system_surface_bright + com.android.wallpaper.R.color.system_surface_bright } else { - R.color.system_surface_container_highest + com.android.wallpaper.R.color.system_surface_container_highest } } } diff --git a/src/com/android/customization/picker/clock/ui/viewmodel/ClockColorViewModel.kt b/src/com/android/customization/picker/clock/ui/viewmodel/ClockColorViewModel.kt index 9d622da5..6e6944df 100644 --- a/src/com/android/customization/picker/clock/ui/viewmodel/ClockColorViewModel.kt +++ b/src/com/android/customization/picker/clock/ui/viewmodel/ClockColorViewModel.kt @@ -19,7 +19,7 @@ package com.android.customization.picker.clock.ui.viewmodel import android.annotation.ColorInt import android.content.res.Resources import android.graphics.Color -import com.android.wallpaper.R +import com.android.themepicker.R /** The view model that defines custom clock colors. */ data class ClockColorViewModel( diff --git a/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt b/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt index d0e4f8fe..2a93f27e 100644 --- a/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt +++ b/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt @@ -31,7 +31,7 @@ import com.android.customization.picker.color.domain.interactor.ColorPickerInter import com.android.customization.picker.color.shared.model.ColorOptionModel import com.android.customization.picker.color.shared.model.ColorType import com.android.customization.picker.color.ui.viewmodel.ColorOptionIconViewModel -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.picker.common.text.ui.viewmodel.Text import com.android.wallpaper.picker.option.ui.viewmodel.OptionItemViewModel import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/src/com/android/customization/picker/color/ui/adapter/ColorTypeTabAdapter.kt b/src/com/android/customization/picker/color/ui/adapter/ColorTypeTabAdapter.kt index 553f5869..62cf62a5 100644 --- a/src/com/android/customization/picker/color/ui/adapter/ColorTypeTabAdapter.kt +++ b/src/com/android/customization/picker/color/ui/adapter/ColorTypeTabAdapter.kt @@ -23,7 +23,7 @@ import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.android.customization.picker.color.ui.viewmodel.ColorTypeTabViewModel -import com.android.wallpaper.R +import com.android.themepicker.R /** Adapts between color type items and views. */ class ColorTypeTabAdapter : RecyclerView.Adapter<ColorTypeTabAdapter.ViewHolder>() { 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 9838c317..7b5b5989 100644 --- a/src/com/android/customization/picker/color/ui/binder/ColorPickerBinder.kt +++ b/src/com/android/customization/picker/color/ui/binder/ColorPickerBinder.kt @@ -33,7 +33,7 @@ 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.ColorPickerViewModel import com.android.customization.picker.common.ui.view.ItemSpacing -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.picker.option.ui.adapter.OptionItemAdapter import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch diff --git a/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt b/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt index df99316c..c2dc381d 100644 --- a/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt +++ b/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt @@ -29,7 +29,7 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import com.android.customization.picker.color.ui.viewmodel.ColorOptionIconViewModel import com.android.customization.picker.color.ui.viewmodel.ColorPickerViewModel -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.picker.common.icon.ui.viewbinder.ContentDescriptionViewBinder import com.android.wallpaper.picker.option.ui.viewmodel.OptionItemViewModel import kotlinx.coroutines.launch 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 8fbbd788..d6c728e8 100644 --- a/src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt +++ b/src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt @@ -32,7 +32,7 @@ import androidx.transition.doOnStart import com.android.customization.model.mode.DarkModeSectionController import com.android.customization.module.ThemePickerInjector import com.android.customization.picker.color.ui.binder.ColorPickerBinder -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.module.CustomizationSections import com.android.wallpaper.module.InjectorProvider import com.android.wallpaper.picker.AppbarFragment @@ -108,7 +108,8 @@ class ColorPickerFragment : AppbarFragment() { authority = requireContext() .getString( - R.string.lock_screen_preview_provider_authority, + com.android.wallpaper.R.string + .lock_screen_preview_provider_authority, ), ), wallpaperInfoProvider = { forceReload -> @@ -159,7 +160,7 @@ class ColorPickerFragment : AppbarFragment() { authorityMetadataKey = requireContext() .getString( - R.string.grid_control_metadata_name, + com.android.wallpaper.R.string.grid_control_metadata_name, ), ), wallpaperInfoProvider = { forceReload -> @@ -255,6 +256,9 @@ class ColorPickerFragment : AppbarFragment() { } override fun getToolbarTextColor(): Int { - return ContextCompat.getColor(requireContext(), R.color.system_on_surface) + return ContextCompat.getColor( + requireContext(), + com.android.wallpaper.R.color.system_on_surface + ) } } diff --git a/src/com/android/customization/picker/color/ui/section/ColorSectionController.kt b/src/com/android/customization/picker/color/ui/section/ColorSectionController.kt index a36fd80a..646d8aca 100644 --- a/src/com/android/customization/picker/color/ui/section/ColorSectionController.kt +++ b/src/com/android/customization/picker/color/ui/section/ColorSectionController.kt @@ -24,7 +24,7 @@ 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.ColorSectionView import com.android.customization.picker.color.ui.viewmodel.ColorPickerViewModel -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.model.CustomizationSectionController import com.android.wallpaper.model.CustomizationSectionController.CustomizationSectionNavigationController as NavigationController diff --git a/src/com/android/customization/picker/color/ui/viewmodel/ColorPickerViewModel.kt b/src/com/android/customization/picker/color/ui/viewmodel/ColorPickerViewModel.kt index ed83136e..32e93626 100644 --- a/src/com/android/customization/picker/color/ui/viewmodel/ColorPickerViewModel.kt +++ b/src/com/android/customization/picker/color/ui/viewmodel/ColorPickerViewModel.kt @@ -24,7 +24,7 @@ import com.android.customization.model.color.ColorOptionImpl import com.android.customization.module.logging.ThemesUserEventLogger import com.android.customization.picker.color.domain.interactor.ColorPickerInteractor import com.android.customization.picker.color.shared.model.ColorType -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.picker.common.text.ui.viewmodel.Text import com.android.wallpaper.picker.option.ui.viewmodel.OptionItemViewModel import kotlin.math.max diff --git a/src/com/android/customization/picker/grid/ui/binder/GridScreenBinder.kt b/src/com/android/customization/picker/grid/ui/binder/GridScreenBinder.kt index bcb37379..9948deec 100644 --- a/src/com/android/customization/picker/grid/ui/binder/GridScreenBinder.kt +++ b/src/com/android/customization/picker/grid/ui/binder/GridScreenBinder.kt @@ -29,7 +29,7 @@ import androidx.recyclerview.widget.RecyclerView import com.android.customization.picker.common.ui.view.ItemSpacing import com.android.customization.picker.grid.ui.viewmodel.GridIconViewModel import com.android.customization.picker.grid.ui.viewmodel.GridScreenViewModel -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.picker.option.ui.adapter.OptionItemAdapter import com.android.wallpaper.picker.option.ui.binder.OptionItemBinder import kotlinx.coroutines.CoroutineDispatcher @@ -45,7 +45,7 @@ object GridScreenBinder { isGridApplyButtonEnabled: Boolean, onOptionApplied: () -> Unit, ) { - val optionView: RecyclerView = view.requireViewById(R.id.options) + val optionView: RecyclerView = view.requireViewById(com.android.wallpaper.R.id.options) optionView.layoutManager = LinearLayoutManager( view.context, @@ -60,8 +60,10 @@ object GridScreenBinder { backgroundDispatcher = backgroundDispatcher, foregroundTintSpec = OptionItemBinder.TintSpec( - selectedColor = view.context.getColor(R.color.system_on_surface), - unselectedColor = view.context.getColor(R.color.system_on_surface), + selectedColor = + view.context.getColor(com.android.wallpaper.R.color.system_on_surface), + unselectedColor = + view.context.getColor(com.android.wallpaper.R.color.system_on_surface), ), bindIcon = { foregroundView: View, gridIcon: GridIconViewModel -> val imageView = foregroundView as? ImageView diff --git a/src/com/android/customization/picker/grid/ui/fragment/GridFragment.kt b/src/com/android/customization/picker/grid/ui/fragment/GridFragment.kt index 2a301b40..74b88db2 100644 --- a/src/com/android/customization/picker/grid/ui/fragment/GridFragment.kt +++ b/src/com/android/customization/picker/grid/ui/fragment/GridFragment.kt @@ -34,7 +34,7 @@ import com.android.customization.module.ThemePickerInjector import com.android.customization.picker.grid.domain.interactor.GridInteractor import com.android.customization.picker.grid.ui.binder.GridScreenBinder import com.android.customization.picker.grid.ui.viewmodel.GridScreenViewModel -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.config.BaseFlags import com.android.wallpaper.module.CurrentWallpaperInfoFactory import com.android.wallpaper.module.CustomizationSections @@ -154,7 +154,10 @@ class GridFragment : AppbarFragment() { } override fun getToolbarTextColor(): Int { - return ContextCompat.getColor(requireContext(), R.color.system_on_surface) + return ContextCompat.getColor( + requireContext(), + com.android.wallpaper.R.color.system_on_surface + ) } private fun bindScreenPreview( @@ -174,7 +177,7 @@ class GridFragment : AppbarFragment() { authorityMetadataKey = requireContext() .getString( - R.string.grid_control_metadata_name, + com.android.wallpaper.R.string.grid_control_metadata_name, ), ), initialExtrasProvider = { diff --git a/src/com/android/customization/picker/grid/ui/section/GridSectionController.java b/src/com/android/customization/picker/grid/ui/section/GridSectionController.java index 6ae9acd9..0e156096 100644 --- a/src/com/android/customization/picker/grid/ui/section/GridSectionController.java +++ b/src/com/android/customization/picker/grid/ui/section/GridSectionController.java @@ -31,7 +31,7 @@ import com.android.customization.model.grid.GridOption; import com.android.customization.model.grid.GridOptionsManager; import com.android.customization.picker.grid.ui.fragment.GridFragment; import com.android.customization.picker.grid.ui.view.GridSectionView; -import com.android.wallpaper.R; +import com.android.themepicker.R; import com.android.wallpaper.model.CustomizationSectionController; import java.util.List; diff --git a/src/com/android/customization/picker/mode/DarkModeSectionView.java b/src/com/android/customization/picker/mode/DarkModeSectionView.java index 6fc0a57f..803fb0e1 100644 --- a/src/com/android/customization/picker/mode/DarkModeSectionView.java +++ b/src/com/android/customization/picker/mode/DarkModeSectionView.java @@ -22,7 +22,7 @@ import android.widget.Switch; import androidx.annotation.Nullable; -import com.android.wallpaper.R; +import com.android.themepicker.R; import com.android.wallpaper.picker.SectionView; /** The view of section in the customization picker fragment. */ diff --git a/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt b/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt index 1868a4e9..8f2727c5 100644 --- a/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt +++ b/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt @@ -25,7 +25,7 @@ import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import com.android.customization.picker.notifications.ui.viewmodel.NotificationSectionViewModel -import com.android.wallpaper.R +import com.android.themepicker.R import kotlinx.coroutines.launch /** diff --git a/src/com/android/customization/picker/notifications/ui/section/NotificationSectionController.kt b/src/com/android/customization/picker/notifications/ui/section/NotificationSectionController.kt index d35c3820..15deb008 100644 --- a/src/com/android/customization/picker/notifications/ui/section/NotificationSectionController.kt +++ b/src/com/android/customization/picker/notifications/ui/section/NotificationSectionController.kt @@ -24,7 +24,7 @@ import androidx.lifecycle.LifecycleOwner import com.android.customization.picker.notifications.ui.binder.NotificationSectionBinder import com.android.customization.picker.notifications.ui.view.NotificationSectionView import com.android.customization.picker.notifications.ui.viewmodel.NotificationSectionViewModel -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.model.CustomizationSectionController /** Controls a section with UI that lets the user toggle notification settings. */ diff --git a/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt b/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt index eb25af7a..c434ce31 100644 --- a/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt +++ b/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt @@ -39,7 +39,7 @@ import com.android.customization.picker.clock.ui.view.ClockCarouselView 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.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.model.CustomizationSectionController import com.android.wallpaper.model.CustomizationSectionController.CustomizationSectionNavigationController import com.android.wallpaper.model.WallpaperPreviewNavigator @@ -111,9 +111,9 @@ class PreviewWithClockCarouselSectionController( val view = super.createView(context, params) if (screen == CustomizationSections.Screen.LOCK_SCREEN) { val screenPreviewClickView: ScreenPreviewClickView = - view.requireViewById(R.id.screen_preview_click_view) + view.requireViewById(com.android.wallpaper.R.id.screen_preview_click_view) val clockColorAndSizeButtonStub: ViewStub = - view.requireViewById(R.id.clock_color_and_size_button) + view.requireViewById(com.android.wallpaper.R.id.clock_color_and_size_button) clockColorAndSizeButtonStub.layoutResource = R.layout.clock_color_and_size_button clockColorAndSizeButton = clockColorAndSizeButtonStub.inflate() as View clockColorAndSizeButton?.setOnClickListener { @@ -127,14 +127,17 @@ class PreviewWithClockCarouselSectionController( val padding = context .getResources() - .getDimensionPixelSize(R.dimen.screen_preview_section_vertical_space) + .getDimensionPixelSize( + com.android.wallpaper.R.dimen.screen_preview_section_vertical_space + ) rect.top -= padding rect.bottom += padding val touchDelegate = TouchDelegate(rect, clockColorAndSizeButton) view.setTouchDelegate(touchDelegate) } - val carouselViewStub: ViewStub = view.requireViewById(R.id.clock_carousel_view_stub) + val carouselViewStub: ViewStub = + view.requireViewById(com.android.wallpaper.R.id.clock_carousel_view_stub) carouselViewStub.layoutResource = R.layout.clock_carousel_view val carouselView = carouselViewStub.inflate() as ClockCarouselView diff --git a/src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt b/src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt index 0e3b7167..fb2462fb 100644 --- a/src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt +++ b/src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt @@ -23,7 +23,7 @@ import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQuickAffordanceSlotViewModel -import com.android.wallpaper.R +import com.android.themepicker.R /** Adapts between lock screen quick affordance slot items and views. */ class SlotTabAdapter : RecyclerView.Adapter<SlotTabAdapter.ViewHolder>() { diff --git a/src/com/android/customization/picker/quickaffordance/ui/binder/KeyguardQuickAffordancePickerBinder.kt b/src/com/android/customization/picker/quickaffordance/ui/binder/KeyguardQuickAffordancePickerBinder.kt index 3ac52ad5..3b583f38 100644 --- a/src/com/android/customization/picker/quickaffordance/ui/binder/KeyguardQuickAffordancePickerBinder.kt +++ b/src/com/android/customization/picker/quickaffordance/ui/binder/KeyguardQuickAffordancePickerBinder.kt @@ -34,7 +34,7 @@ import androidx.recyclerview.widget.RecyclerView import com.android.customization.picker.common.ui.view.ItemSpacing import com.android.customization.picker.quickaffordance.ui.adapter.SlotTabAdapter import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQuickAffordancePickerViewModel -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.picker.common.dialog.ui.viewbinder.DialogViewBinder import com.android.wallpaper.picker.common.dialog.ui.viewmodel.DialogViewModel import com.android.wallpaper.picker.common.icon.ui.viewbinder.IconViewBinder diff --git a/src/com/android/customization/picker/quickaffordance/ui/binder/KeyguardQuickAffordanceSectionViewBinder.kt b/src/com/android/customization/picker/quickaffordance/ui/binder/KeyguardQuickAffordanceSectionViewBinder.kt index 7e1f4d3c..b771fb74 100644 --- a/src/com/android/customization/picker/quickaffordance/ui/binder/KeyguardQuickAffordanceSectionViewBinder.kt +++ b/src/com/android/customization/picker/quickaffordance/ui/binder/KeyguardQuickAffordanceSectionViewBinder.kt @@ -26,7 +26,7 @@ import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQuickAffordancePickerViewModel -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.picker.common.icon.ui.viewbinder.IconViewBinder import com.android.wallpaper.picker.common.text.ui.viewbinder.TextViewBinder import kotlinx.coroutines.flow.collectLatest diff --git a/src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt b/src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt index 467e5a07..fd79ca5b 100644 --- a/src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt +++ b/src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt @@ -31,7 +31,7 @@ import com.android.customization.module.ThemePickerInjector import com.android.customization.picker.quickaffordance.ui.binder.KeyguardQuickAffordancePickerBinder import com.android.customization.picker.quickaffordance.ui.binder.KeyguardQuickAffordancePreviewBinder import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQuickAffordancePickerViewModel -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.module.InjectorProvider import com.android.wallpaper.picker.AppbarFragment @@ -97,6 +97,9 @@ class KeyguardQuickAffordancePickerFragment : AppbarFragment() { } override fun getToolbarTextColor(): Int { - return ContextCompat.getColor(requireContext(), R.color.system_on_surface) + return ContextCompat.getColor( + requireContext(), + com.android.wallpaper.R.color.system_on_surface + ) } } diff --git a/src/com/android/customization/picker/quickaffordance/ui/section/KeyguardQuickAffordanceSectionController.kt b/src/com/android/customization/picker/quickaffordance/ui/section/KeyguardQuickAffordanceSectionController.kt index 0c7b250d..52bbb0ce 100644 --- a/src/com/android/customization/picker/quickaffordance/ui/section/KeyguardQuickAffordanceSectionController.kt +++ b/src/com/android/customization/picker/quickaffordance/ui/section/KeyguardQuickAffordanceSectionController.kt @@ -24,7 +24,7 @@ import com.android.customization.picker.quickaffordance.ui.binder.KeyguardQuickA import com.android.customization.picker.quickaffordance.ui.fragment.KeyguardQuickAffordancePickerFragment import com.android.customization.picker.quickaffordance.ui.view.KeyguardQuickAffordanceSectionView import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQuickAffordancePickerViewModel -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.config.BaseFlags import com.android.wallpaper.model.CustomizationSectionController import com.android.wallpaper.model.CustomizationSectionController.CustomizationSectionNavigationController as NavigationController diff --git a/src/com/android/customization/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModel.kt b/src/com/android/customization/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModel.kt index 260c0d3b..97afb7af 100644 --- a/src/com/android/customization/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModel.kt +++ b/src/com/android/customization/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModel.kt @@ -30,7 +30,7 @@ import com.android.customization.module.logging.ThemesUserEventLogger import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordancePickerInteractor import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.module.CurrentWallpaperInfoFactory import com.android.wallpaper.module.CustomizationSections import com.android.wallpaper.picker.common.button.ui.viewmodel.ButtonStyle @@ -76,7 +76,7 @@ private constructor( context = applicationContext, authority = applicationContext.getString( - R.string.lock_screen_preview_provider_authority, + com.android.wallpaper.R.string.lock_screen_preview_provider_authority, ), ), initialExtrasProvider = { diff --git a/src/com/android/customization/picker/settings/ui/section/MoreSettingsSectionController.kt b/src/com/android/customization/picker/settings/ui/section/MoreSettingsSectionController.kt index 5e890cdd..7302b0f5 100644 --- a/src/com/android/customization/picker/settings/ui/section/MoreSettingsSectionController.kt +++ b/src/com/android/customization/picker/settings/ui/section/MoreSettingsSectionController.kt @@ -23,7 +23,7 @@ import android.content.Intent import android.provider.Settings import android.view.LayoutInflater import com.android.customization.picker.settings.ui.view.MoreSettingsSectionView -import com.android.wallpaper.R +import com.android.themepicker.R import com.android.wallpaper.model.CustomizationSectionController class MoreSettingsSectionController : CustomizationSectionController<MoreSettingsSectionView> { diff --git a/src/com/android/customization/picker/themedicon/ThemedIconSectionView.java b/src/com/android/customization/picker/themedicon/ThemedIconSectionView.java index f83da8c1..2bbe74ee 100644 --- a/src/com/android/customization/picker/themedicon/ThemedIconSectionView.java +++ b/src/com/android/customization/picker/themedicon/ThemedIconSectionView.java @@ -21,7 +21,7 @@ import android.widget.Switch; import androidx.annotation.Nullable; -import com.android.wallpaper.R; +import com.android.themepicker.R; import com.android.wallpaper.picker.SectionView; /** |