Snap for 12616459 from d8337ebcf984e2e630ecd20cdc995c53ad73585e to 25Q1-release
Change-Id: Ib1c4a32abae2d8e8e1cf405ed98c7ee5f999cd17
diff --git a/res/layout/floating_sheet_clock.xml b/res/layout/floating_sheet_clock.xml
index 75afce6..ec2e6c1 100644
--- a/res/layout/floating_sheet_clock.xml
+++ b/res/layout/floating_sheet_clock.xml
@@ -189,7 +189,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center_horizontal"
- android:layout_marginVertical="@dimen/floating_sheet_tab_toolbar_vertical_margin">
+ android:layout_marginTop="@dimen/floating_sheet_tab_clock_font_toolbar_top_margin"
+ android:layout_marginBottom="@dimen/floating_sheet_tab_clock_font_toolbar_bottom_margin">
<ImageView
android:id="@+id/clock_font_revert"
@@ -197,6 +198,7 @@
android:layout_height="wrap_content"
android:src="@drawable/clock_font_revert"
android:contentDescription="@string/clock_font_editor_revert" />
+
<ImageView
android:id="@+id/clock_font_apply"
android:layout_width="wrap_content"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d8d30d3..e5d21ea 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -185,6 +185,8 @@
<dimen name="floating_sheet_content_horizontal_padding">20dp</dimen>
<dimen name="floating_sheet_horizontal_padding">16dp</dimen>
<dimen name="floating_sheet_tab_toolbar_vertical_margin">8dp</dimen>
+ <dimen name="floating_sheet_tab_clock_font_toolbar_top_margin">16dp</dimen>
+ <dimen name="floating_sheet_tab_clock_font_toolbar_bottom_margin">8dp</dimen>
<dimen name="floating_sheet_list_item_horizontal_space">4dp</dimen>
<dimen name="floating_sheet_list_item_vertical_space">4dp</dimen>
<dimen name="floating_sheet_clock_style_option_size">82dp</dimen>
diff --git a/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt
index bb66831..2d53c0e 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt
@@ -104,12 +104,12 @@
val clockFontContent =
view.requireViewById<ViewGroup>(R.id.clock_floating_sheet_font_content)
val clockFontToolbar = view.requireViewById<ViewGroup>(R.id.clock_font_toolbar)
- clockFontToolbar
- .requireViewById<View>(R.id.clock_font_revert)
- .setOnClickListener(View.OnClickListener { viewModel.revertFontAxes() })
- clockFontToolbar
- .requireViewById<View>(R.id.clock_font_apply)
- .setOnClickListener(View.OnClickListener { viewModel.applyFontAxes() })
+ clockFontToolbar.requireViewById<View>(R.id.clock_font_revert).setOnClickListener {
+ viewModel.revertFontAxes()
+ }
+ clockFontToolbar.requireViewById<View>(R.id.clock_font_apply).setOnClickListener {
+ viewModel.applyFontAxes()
+ }
// Clock color
val clockColorContent = view.requireViewById<View>(R.id.clock_floating_sheet_color_content)
diff --git a/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt b/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt
index 71b31c2..11124f9 100644
--- a/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt
+++ b/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt
@@ -91,7 +91,7 @@
contentDescription = Text.Resource(R.string.clock_style),
),
context.getString(R.string.clock_style),
- it == Tab.STYLE,
+ it == Tab.STYLE || it == Tab.FONT,
) {
_selectedTab.value = Tab.STYLE
},
diff --git a/src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt b/src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt
index 31b4cd8..1c4ecc9 100644
--- a/src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt
+++ b/src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt
@@ -46,9 +46,11 @@
import com.android.wallpaper.picker.category.domain.interactor.CategoriesLoadingStatusInteractor
import com.android.wallpaper.picker.category.domain.interactor.CategoryInteractor
import com.android.wallpaper.picker.category.domain.interactor.CreativeCategoryInteractor
+import com.android.wallpaper.picker.category.domain.interactor.ThirdPartyCategoryInteractor
import com.android.wallpaper.picker.category.domain.interactor.implementations.CategoryInteractorImpl
import com.android.wallpaper.picker.category.domain.interactor.implementations.CreativeCategoryInteractorImpl
import com.android.wallpaper.picker.category.domain.interactor.implementations.DefaultCategoriesLoadingStatusInteractor
+import com.android.wallpaper.picker.category.domain.interactor.implementations.ThirdPartyCategoryInteractorImpl
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
@@ -141,6 +143,12 @@
@Singleton
abstract fun bindThemesUserEventLogger(impl: ThemesUserEventLoggerImpl): ThemesUserEventLogger
+ @Binds
+ @Singleton
+ abstract fun bindThirdPartyCategoryInteractor(
+ impl: ThirdPartyCategoryInteractorImpl
+ ): ThirdPartyCategoryInteractor
+
@Binds @Singleton abstract fun bindToolbarBinder(impl: ThemePickerToolbarBinder): ToolbarBinder
@Binds
diff --git a/tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt b/tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt
index 8f09d51..94af717 100644
--- a/tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt
+++ b/tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt
@@ -45,6 +45,7 @@
import com.android.wallpaper.module.logging.UserEventLogger
import com.android.wallpaper.modules.ThemePickerAppModule
import com.android.wallpaper.network.Requester
+import com.android.wallpaper.picker.category.domain.interactor.ThirdPartyCategoryInteractor
import com.android.wallpaper.picker.category.wrapper.WallpaperCategoryWrapper
import com.android.wallpaper.picker.common.preview.ui.binder.ThemePickerWorkspaceCallbackBinder
import com.android.wallpaper.picker.common.preview.ui.binder.WorkspaceCallbackBinder
@@ -56,6 +57,7 @@
import com.android.wallpaper.picker.preview.ui.util.DefaultImageEffectDialogUtil
import com.android.wallpaper.picker.preview.ui.util.ImageEffectDialogUtil
import com.android.wallpaper.testing.FakeDefaultRequester
+import com.android.wallpaper.testing.FakeThirdPartyCategoryInteractor
import com.android.wallpaper.testing.FakeWallpaperCategoryWrapper
import com.android.wallpaper.testing.TestPartnerProvider
import com.android.wallpaper.util.converter.DefaultWallpaperModelFactory
@@ -126,6 +128,12 @@
@Singleton
abstract fun bindThemesUserEventLogger(impl: TestThemesUserEventLogger): ThemesUserEventLogger
+ @Binds
+ @Singleton
+ abstract fun bindThirdPartyCategoryInteractor(
+ impl: FakeThirdPartyCategoryInteractor
+ ): ThirdPartyCategoryInteractor
+
@Binds @Singleton abstract fun bindToolbarBinder(impl: ThemePickerToolbarBinder): ToolbarBinder
@Binds @Singleton abstract fun bindUserEventLogger(impl: TestUserEventLogger): UserEventLogger