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

Commit 353b3383 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12616459 from d8337ebc to 25Q1-release 

Change-Id: Ib1c4a32abae2d8e8e1cf405ed98c7ee5f999cd17
parents 3f17e50e d8337ebc

res/layout/floating_sheet_clock.xml

+3 −1
Original line number Diff line number Diff line
@@ -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"

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

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

+6 −6
Original line number Diff line number Diff line
@@ -104,12 +104,12 @@ object ClockFloatingSheetBinder { 
        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)

src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ constructor( 
                        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

                },

src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt

+8 −0
Original line number Diff line number Diff line
@@ -46,9 +46,11 @@ import com.android.wallpaper.module.logging.UserEventLogger 
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 @@ abstract class ThemePickerAppModule { 
    @Singleton

    abstract fun bindThemesUserEventLogger(impl: ThemesUserEventLoggerImpl): ThemesUserEventLogger



    @Binds

    @Singleton

    abstract fun bindThirdPartyCategoryInteractor(

        impl: ThirdPartyCategoryInteractorImpl

    ): ThirdPartyCategoryInteractor



    @Binds @Singleton abstract fun bindToolbarBinder(impl: ThemePickerToolbarBinder): ToolbarBinder



    @Binds