diff options
| author | Pierre-Louis <plg@google.com> | 2021-04-17 18:43:24 +0200 |
|---|---|---|
| committer | Pierre-Louis Guidez <plg@google.com> | 2021-04-19 17:49:56 +0000 |
| commit | 9d58de61575efea66fbf49650b4803edf7c84bdb (patch) | |
| tree | 05c8741241a5d2533931d16ab2f7a3b09e665972 | |
| parent | 818cb7a73284cd96ba4ad51e5f8b14381e60afa7 (diff) | |
| download | platform_packages_apps_WallpaperPicker2-9d58de61575efea66fbf49650b4803edf7c84bdb.tar.gz platform_packages_apps_WallpaperPicker2-9d58de61575efea66fbf49650b4803edf7c84bdb.tar.bz2 platform_packages_apps_WallpaperPicker2-9d58de61575efea66fbf49650b4803edf7c84bdb.zip | |
Always use dark primary text on accent background
Fixes: 185303343
Fixes: 185742584
Tested: manual
Change-Id: Ife7ee3d5f17e4b06a2db36b654f59bf9ff01a004
| -rw-r--r-- | res/color/bottom_action_button_color_tint.xml | 2 | ||||
| -rw-r--r-- | res/layout/pill_tabs.xml | 2 | ||||
| -rwxr-xr-x | res/values/colors.xml | 3 | ||||
| -rwxr-xr-x | res/values/styles.xml | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/res/color/bottom_action_button_color_tint.xml b/res/color/bottom_action_button_color_tint.xml index 8f89fbe..860a532 100644 --- a/res/color/bottom_action_button_color_tint.xml +++ b/res/color/bottom_action_button_color_tint.xml @@ -20,5 +20,5 @@ android:color="?android:textColorTertiary" /> <item android:state_selected="true" - android:color="?android:textColorPrimary" /> + android:color="@color/text_color_primary_on_accent" /> </selector>
\ No newline at end of file diff --git a/res/layout/pill_tabs.xml b/res/layout/pill_tabs.xml index 1ba9982..5a57981 100644 --- a/res/layout/pill_tabs.xml +++ b/res/layout/pill_tabs.xml @@ -29,5 +29,5 @@ app:tabIndicatorFullWidth="true" app:tabIndicatorGravity="stretch" app:tabTextColor="?android:textColorTertiary" - app:tabSelectedTextColor="?android:textColorPrimary" + app:tabSelectedTextColor="@color/text_color_primary_on_accent" app:tabTextAppearance="@style/PillTabsTextAppearance" /> diff --git a/res/values/colors.xml b/res/values/colors.xml index f468718..0bd3e8f 100755 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -51,4 +51,7 @@ <color name="selected_check_color">@color/material_white_100</color> <color name="smartspace_preview_shadow_color_dark">#B0000000</color> <color name="smartspace_preview_shadow_color_transparent">@android:color/transparent</color> + + <!-- Primary text on top of accent colors should always be dark --> + <color name="text_color_primary_on_accent">@*android:color/text_color_primary_device_default_light</color> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 270c247..d3effc8 100755 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -200,7 +200,7 @@ <item name="android:minWidth">@dimen/set_wallpaper_dialog_item_min_width</item> <item name="android:textAlignment">center</item> <item name="android:textSize">@dimen/abc_text_size_small_material</item> - <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:textColor">@color/text_color_primary_on_accent</item> <item name="android:letterSpacing">0.02</item> <item name="android:gravity">center</item> <item name="android:background">@drawable/dialog_option_background</item> |