Merge remote-tracking branch 'goog/ub-setupwizard-belgarath'. DO NOT MERGE
Change-Id: I4ad43d6fa75d0872f6bb1ef969cc5cf2bc4a1268
diff --git a/library/eclair-mr1/res/values/styles.xml b/library/eclair-mr1/res/values/styles.xml
index 0b2dcda..fa954c6 100644
--- a/library/eclair-mr1/res/values/styles.xml
+++ b/library/eclair-mr1/res/values/styles.xml
@@ -79,8 +79,8 @@
<item name="android:windowDisablePreview">true</item>
<item name="android:windowSoftInputMode">adjustResize</item>
- <item name="colorAccent">@color/suw_color_accent_glif_dark</item>
- <item name="colorPrimary">@color/suw_color_accent_glif_dark</item>
+ <item name="colorAccent">@color/suw_color_accent_light</item>
+ <item name="colorPrimary">@color/suw_color_accent_light</item>
<item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
<item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
<item name="suwListItemIconColor">@color/suw_list_item_icon_color_dark</item>
@@ -104,8 +104,8 @@
<item name="android:windowDisablePreview">true</item>
<item name="android:windowSoftInputMode">adjustResize</item>
- <item name="colorAccent">@color/suw_color_accent_glif_light</item>
- <item name="colorPrimary">@color/suw_color_accent_glif_light</item>
+ <item name="colorAccent">@color/suw_color_accent_light</item>
+ <item name="colorPrimary">@color/suw_color_accent_light</item>
<item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
<item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
<item name="suwListItemIconColor">@color/suw_list_item_icon_color_light</item>
diff --git a/library/eclair-mr1/src/com/android/setupwizardlib/view/NavigationBarButton.java b/library/eclair-mr1/src/com/android/setupwizardlib/view/NavigationBarButton.java
index 6e555a1..1ffc034 100644
--- a/library/eclair-mr1/src/com/android/setupwizardlib/view/NavigationBarButton.java
+++ b/library/eclair-mr1/src/com/android/setupwizardlib/view/NavigationBarButton.java
@@ -44,7 +44,7 @@
Drawable[] drawables = getCompoundDrawablesRelative();
for (int i = 0; i < drawables.length; i++) {
if (drawables[i] != null) {
- drawables[i] = TintedDrawable.wrap(drawables[i]);
+ drawables[i] = TintedDrawable.wrap(drawables[i].mutate());
}
}
setCompoundDrawablesRelativeWithIntrinsicBounds(drawables[0], drawables[1],
@@ -54,10 +54,10 @@
@Override
public void setCompoundDrawables(Drawable left, Drawable top, Drawable right, Drawable bottom) {
- if (left != null) left = TintedDrawable.wrap(left);
- if (top != null) top = TintedDrawable.wrap(top);
- if (right != null) right = TintedDrawable.wrap(right);
- if (bottom != null) bottom = TintedDrawable.wrap(bottom);
+ if (left != null) left = TintedDrawable.wrap(left.mutate());
+ if (top != null) top = TintedDrawable.wrap(top.mutate());
+ if (right != null) right = TintedDrawable.wrap(right.mutate());
+ if (bottom != null) bottom = TintedDrawable.wrap(bottom.mutate());
super.setCompoundDrawables(left, top, right, bottom);
tintDrawables();
}
@@ -65,10 +65,10 @@
@Override
public void setCompoundDrawablesRelative(Drawable start, Drawable top, Drawable end,
Drawable bottom) {
- if (start != null) start = TintedDrawable.wrap(start);
- if (top != null) top = TintedDrawable.wrap(top);
- if (end != null) end = TintedDrawable.wrap(end);
- if (bottom != null) bottom = TintedDrawable.wrap(bottom);
+ if (start != null) start = TintedDrawable.wrap(start.mutate());
+ if (top != null) top = TintedDrawable.wrap(top.mutate());
+ if (end != null) end = TintedDrawable.wrap(end.mutate());
+ if (bottom != null) bottom = TintedDrawable.wrap(bottom.mutate());
super.setCompoundDrawablesRelative(start, top, end, bottom);
tintDrawables();
}
@@ -114,7 +114,7 @@
if (drawable instanceof TintedDrawable) {
return (TintedDrawable) drawable;
}
- return new TintedDrawable(drawable.mutate());
+ return new TintedDrawable(drawable);
}
private ColorStateList mTintList = null;
diff --git a/library/main/res/values/colors.xml b/library/main/res/values/colors.xml
index 240d0ac..a4470d1 100644
--- a/library/main/res/values/colors.xml
+++ b/library/main/res/values/colors.xml
@@ -33,8 +33,4 @@
<color name="suw_navbar_bg_dark">#ff21272b</color>
<color name="suw_navbar_bg_light">#ffe4e7e9</color>
- <!-- GLIF colors -->
- <color name="suw_color_accent_glif_dark">#ff4285f4</color>
- <color name="suw_color_accent_glif_light">#ff4285f4</color>
-
</resources>
diff --git a/library/platform/res/values-v21/styles.xml b/library/platform/res/values-v21/styles.xml
index 8c74d58..4a5ae8d 100644
--- a/library/platform/res/values-v21/styles.xml
+++ b/library/platform/res/values-v21/styles.xml
@@ -70,8 +70,8 @@
<!-- Placeholder for GLIF dark theme, colors are not updated yet -->
<style name="SuwThemeGlif" parent="android:Theme.Material.NoActionBar">
- <item name="android:colorAccent">@color/suw_color_accent_glif_dark</item>
- <item name="android:colorPrimary">@color/suw_color_accent_glif_light</item>
+ <item name="android:colorAccent">@color/suw_color_accent_light</item>
+ <item name="android:colorPrimary">@color/suw_color_accent_light</item>
<item name="android:indeterminateTint">?android:attr/colorPrimary</item>
<!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
<item name="android:indeterminateTintMode">src_in</item>
@@ -92,8 +92,8 @@
</style>
<style name="SuwThemeGlif.Light" parent="android:Theme.Material.Light.NoActionBar">
- <item name="android:colorAccent">@color/suw_color_accent_glif_dark</item>
- <item name="android:colorPrimary">@color/suw_color_accent_glif_light</item>
+ <item name="android:colorAccent">@color/suw_color_accent_light</item>
+ <item name="android:colorPrimary">@color/suw_color_accent_light</item>
<item name="android:indeterminateTint">?android:attr/colorPrimary</item>
<!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
<item name="android:indeterminateTintMode">src_in</item>
