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

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

Snap for 14010066 from 822046f0 to 25Q4-release 

Change-Id: I56e094fd85bf177379cc7630d7271e5de086390c
parents 301b2781 822046f0

res/layout/customization_option_entry_pack_theme.xml

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:background="@drawable/ic_pack_theme_24px"

            android:contentDescription="@string/pack_theme_preview_card_content_description"

            android:contentDescription="@null"

            android:layout_centerInParent="true"/>

    </RelativeLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

res/layout/floating_sheet_colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
            android:layout_height="wrap_content"

            android:layout_marginHorizontal="@dimen/floating_sheet_content_horizontal_padding"

            android:background="@null"

            android:focusable="true"

            android:minHeight="@dimen/accessibility_min_height"

            android:text="@string/mode_title"

            android:textAppearance="@style/SwitchSectionTitleTextStyle"

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -183,9 +183,6 @@ 
    <!-- Content description of grid preview card. [CHAR_LIMIT=30]-->

    <string name="grid_preview_card_content_description">Grid preview</string>



    <!-- Content description of theme preview card. [CHAR_LIMIT=30]-->

    <string name="pack_theme_preview_card_content_description">Content Description</string>



    <!-- Content description of font preview. [CHAR_LIMIT=30]-->

    <string name="font_preview_content_description">Font preview</string>

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

+2 −1
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ constructor(private val defaultCustomizationOptionsBinder: DefaultCustomizationO 


        val isComposeRefactorEnabled = BaseFlags.get().isComposeRefactorEnabled()

        val isColorPickerUpdateEnabled = BaseFlags.get().isColorPickerUpdateEnabled()

        val isColorPickerComposeEnabled = BaseFlags.get().isColorPickerComposeEnabled()



        val showPackEntry =

            Settings.Secure.getInt(
@@ -617,7 +618,7 @@ constructor(private val defaultCustomizationOptionsBinder: DefaultCustomizationO 
                }

        }



        if (!isColorPickerUpdateEnabled) {

        if (!isColorPickerUpdateEnabled || !isColorPickerComposeEnabled) {

            customizationOptionFloatingSheetViewMap

                ?.get(ThemePickerHomeCustomizationOption.COLORS)

                ?.let {

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

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ class ThemePickerSuggestedEntryBinder @Inject constructor() : PackThemeSuggested 
        )

        ColorUpdateBinder.bind(

            setColor = { color ->

                DrawableCompat.setTint(DrawableCompat.wrap(view.cancelButton.background), color)

                DrawableCompat.setTint(DrawableCompat.wrap(view.cancelButton.drawable), color)

                DrawableCompat.setTint(DrawableCompat.wrap(view.icon.background), color)

                view.suggestedChipText.setTextColor(color)

            },