summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2015-05-07 10:18:28 -0700
committerMaurice Lam <yukl@google.com>2015-05-07 10:18:28 -0700
commit5627b5ed7e8d6416b204a855a6ddc0e8951112da (patch)
tree4ac9b004ce8f9b9f814b8c2ebc07c059e264b742
parentb703dcd41045adc3d73ab83d297443f29b441599 (diff)
downloadsetupwizard-5627b5ed7e8d6416b204a855a6ddc0e8951112da.tar.gz
[SetupWizardLib] Fix progress bar tint for L
Explicitly specify the indeterminateTintMode to work around a bug in L. Bug: 20891225 Change-Id: I017fb49a39f6356e59838bf545b9cbed7ac73884
-rw-r--r--library/eclair-mr1/res/values/styles.xml4
-rw-r--r--library/platform/res/values-v21/styles.xml4
2 files changed, 8 insertions, 0 deletions
diff --git a/library/eclair-mr1/res/values/styles.xml b/library/eclair-mr1/res/values/styles.xml
index 88e06e9..e7db9ac 100644
--- a/library/eclair-mr1/res/values/styles.xml
+++ b/library/eclair-mr1/res/values/styles.xml
@@ -21,6 +21,8 @@
<style name="SuwThemeMaterial" parent="Theme.AppCompat.NoActionBar">
<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>
<item name="android:textColorLink">@color/suw_link_color_dark</item>
<item name="android:textColorSecondary">@color/suw_color_secondary_dark</item>
<item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
@@ -33,6 +35,8 @@
<style name="SuwThemeMaterial.Light" parent="Theme.AppCompat.Light.NoActionBar">
<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>
<item name="android:textColorLink">@color/suw_link_color_light</item>
<item name="android:textColorSecondary">@color/suw_color_secondary_light</item>
<item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
diff --git a/library/platform/res/values-v21/styles.xml b/library/platform/res/values-v21/styles.xml
index 8d311a4..1afe85c 100644
--- a/library/platform/res/values-v21/styles.xml
+++ b/library/platform/res/values-v21/styles.xml
@@ -27,6 +27,8 @@
<style name="SuwThemeMaterial" parent="android:Theme.Material.NoActionBar">
<item name="android:colorAccent">@color/suw_color_accent_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>
<item name="android:navigationBarColor">@android:color/black</item>
<item name="android:statusBarColor">@android:color/black</item>
<item name="android:textColorLink">@color/suw_link_color_dark</item>
@@ -41,6 +43,8 @@
<style name="SuwThemeMaterial.Light" parent="android:Theme.Material.Light.NoActionBar">
<item name="android:colorAccent">@color/suw_color_accent_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>
<item name="android:navigationBarColor">@android:color/black</item>
<item name="android:statusBarColor">@android:color/black</item>
<item name="android:textColorLink">@color/suw_link_color_light</item>