Merge "Import translations. DO NOT MERGE ANYWHERE" into main
diff --git a/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt b/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt
index eb02974..a0aa38b 100644
--- a/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt
@@ -137,7 +137,10 @@
}
override fun updateFontAxes(clockId: String, settings: ClockAxisStyle) {
- getController(clockId)?.let { it.events.onFontAxesChanged(settings) }
+ getController(clockId)?.let {
+ it.largeClock.animations.onFontAxesChanged(settings)
+ it.smallClock.animations.onFontAxesChanged(settings)
+ }
}
override fun updateRegionDarkness() {
diff --git a/src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt b/src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt
index 41b8099..95992fa 100644
--- a/src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt
+++ b/src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt
@@ -61,6 +61,8 @@
import com.android.wallpaper.picker.category.domain.interactor.implementations.DefaultCuratedPhotosInteractorImpl
import com.android.wallpaper.picker.category.domain.interactor.implementations.DefaultOnDeviceWallpapersInteractor
import com.android.wallpaper.picker.category.domain.interactor.implementations.ThirdPartyCategoryInteractorImpl
+import com.android.wallpaper.picker.category.ui.binder.BannerProvider
+import com.android.wallpaper.picker.category.ui.binder.DefaultBannerProvider
import com.android.wallpaper.picker.category.ui.view.providers.IndividualPickerFactory
import com.android.wallpaper.picker.category.ui.view.providers.implementation.DefaultIndividualPickerFactory
import com.android.wallpaper.picker.category.wrapper.DefaultWallpaperCategoryWrapper
@@ -89,6 +91,8 @@
@InstallIn(SingletonComponent::class)
abstract class ThemePickerAppModule {
+ @Binds @Singleton abstract fun bindBannerProvider(impl: DefaultBannerProvider): BannerProvider
+
@Binds
@Singleton
abstract fun bindClockPickerRepository(impl: ClockPickerRepositoryImpl): ClockPickerRepository