diff options
author | Maurice Lam <yukl@google.com> | 2017-11-21 18:39:27 -0800 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2017-11-21 18:39:27 -0800 |
commit | 4d2145974cef3022ec4162d77ef50d74a720c4f0 (patch) | |
tree | 445a99063ddf414664ef91d01dc0cc664e593f6c | |
parent | c14032ba1f80dd1e1877eadec2543546e9d0f449 (diff) | |
download | setupwizard-4d2145974cef3022ec4162d77ef50d74a720c4f0.tar.gz |
Specify colorBackground in material theme
Lollipop and Marshmallow have different background colors. Specify
the color in SuwThemeMaterial so they are consistent across OS
versions.
Test: Manual
Bug: 69563212
Change-Id: Ice36a8f74796c0dd804fa897d74188c9ff88354d
-rw-r--r-- | library/gingerbread/res/values/styles.xml | 2 | ||||
-rw-r--r-- | library/main/res/values/colors.xml | 2 | ||||
-rw-r--r-- | library/platform/res/values-v23/styles.xml | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml index 6e525ef..b556f07 100644 --- a/library/gingerbread/res/values/styles.xml +++ b/library/gingerbread/res/values/styles.xml @@ -20,6 +20,7 @@ <!-- General styles --> <style name="SuwThemeMaterial" parent="Theme.AppCompat.NoActionBar"> + <item name="android:colorBackground">@color/suw_color_background_dark</item> <item name="android:indeterminateTint" tools:ignore="NewApi">@color/suw_progress_bar_color_dark</item> <!-- Specify the indeterminateTintMode to work around a bug in Lollipop --> <item name="android:indeterminateTintMode" tools:ignore="NewApi">src_in</item> @@ -51,6 +52,7 @@ </style> <style name="SuwThemeMaterial.Light" parent="Theme.AppCompat.Light.NoActionBar"> + <item name="android:colorBackground">@color/suw_color_background_light</item> <item name="android:indeterminateTint" tools:ignore="NewApi">@color/suw_progress_bar_color_light</item> <!-- Specify the indeterminateTintMode to work around a bug in Lollipop --> <item name="android:indeterminateTintMode" tools:ignore="NewApi">src_in</item> diff --git a/library/main/res/values/colors.xml b/library/main/res/values/colors.xml index cd57a8a..b20098d 100644 --- a/library/main/res/values/colors.xml +++ b/library/main/res/values/colors.xml @@ -21,6 +21,8 @@ <color name="suw_color_accent_dark">#ff448aff</color> <color name="suw_color_accent_light">#ff3367d6</color> + <color name="suw_color_background_dark">#ff303030</color> + <color name="suw_color_background_light">#fffafafa</color> <color name="suw_link_color_dark">#ff448aff</color> <color name="suw_link_color_light">#ff3367d6</color> <color name="suw_list_item_icon_color_dark">#b3ffffff</color> diff --git a/library/platform/res/values-v23/styles.xml b/library/platform/res/values-v23/styles.xml index 9fff5f1..17ad09a 100644 --- a/library/platform/res/values-v23/styles.xml +++ b/library/platform/res/values-v23/styles.xml @@ -26,6 +26,7 @@ Theme.AppCompat. --> <style name="SuwThemeMaterial" parent="android:Theme.Material.NoActionBar"> <item name="android:colorAccent">@color/suw_color_accent_dark</item> + <item name="android:colorBackground">@color/suw_color_background_dark</item> <item name="android:indeterminateTint">@color/suw_progress_bar_color_dark</item> <!-- Specify the indeterminateTintMode to work around a bug in Lollipop --> <item name="android:indeterminateTintMode">src_in</item> @@ -54,6 +55,7 @@ <style name="SuwThemeMaterial.Light" parent="android:Theme.Material.Light.NoActionBar"> <item name="android:colorAccent">@color/suw_color_accent_light</item> + <item name="android:colorBackground">@color/suw_color_background_light</item> <item name="android:indeterminateTint">@color/suw_progress_bar_color_light</item> <!-- Specify the indeterminateTintMode to work around a bug in Lollipop --> <item name="android:indeterminateTintMode">src_in</item> |