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

Commit e84e1590 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adjust text and symbol colors on picker fragments (2/2)" into udc-qpr-dev am: c81b5ce3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/24469851



Change-Id: Ia0780fd46279923aeae0fef4c04cff622be73a22
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac213b0b c81b5ce3

res/drawable/color_overflow.xml

+2 −1
Original line number Diff line number Diff line
@@ -25,10 +25,11 @@ 
            android:innerRadius="@dimen/component_color_overflow_small_radius_default"

            android:thickness="-1dp"

            android:useLevel="false">

            <solid android:color="@color/color_surface_variant"/>

            <solid android:color="@color/system_outline"/>

        </shape>

    </item>

    <item

        android:drawable="@drawable/ic_more_horiz"

        android:tint="@color/system_on_surface"

        android:gravity="center"/>

</layer-list>
 
 No newline at end of file

res/layout/clock_color_option.xml

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

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/option_bottom_margin"

        android:textColor="@color/text_color_primary"

        android:textColor="@color/system_on_surface"

        android:maxLines="2"

        android:hyphenationFrequency="normal"

        android:ellipsize="end"

res/layout/fragment_color_picker.xml

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 
            android:id="@+id/color_type_tab_subhead"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textColor="@color/text_color_secondary"

            android:textColor="@color/system_on_surface_variant"

            android:textSize="12sp"

            android:gravity="center"

            android:paddingHorizontal="16dp"/>

res/layout/grid_option_2.xml

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
        android:id="@id/text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textColor="@color/text_color_primary"

        android:textColor="@color/system_on_surface"

        android:singleLine="true"

        android:ellipsize="end"

        android:text="Placeholder for stable size calculation, please do not remove."

res/layout/grid_section_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
        android:layout_height="@dimen/option_tile_width"

        android:scaleType="center"

        android:src="@drawable/ic_grid_24px"

        android:tint="@color/system_on_surface"

        android:background="@drawable/picker_section_icon_background"

        android:contentDescription="@string/gird_picker_entry_content_description" />