PeterCxy/SetupWizardLibrary
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SuwLib] Move mutate into TintedDrawable

Browse source 
Move mutate() into TintedDrawable to prevent it from being called
multiple times, which causes the drawable to disappear on KitKat.

Bug: 28391968
Change-Id: Ib1a839344c7cb20f7bde3f21b877a0296391bc52
This commit is contained in:
Maurice Lam 2016-04-27 18:24:03 -07:00
parent 7f2a6e95f2
commit 9a9b071339
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
library/eclair-mr1/src/com/android/setupwizardlib/view/NavigationBarButton.java
View file

@ -44,7 +44,7 @@ public class NavigationBarButton extends Button {
Drawable[] drawables = getCompoundDrawablesRelative();
for (int i = 0; i < drawables.length; i++) {
if (drawables[i] != null) {
drawables[i] = TintedDrawable.wrap(drawables[i].mutate());
drawables[i] = TintedDrawable.wrap(drawables[i]);
}
}
setCompoundDrawablesRelativeWithIntrinsicBounds(drawables[0], drawables[1],
@ -54,10 +54,10 @@ public class NavigationBarButton extends Button {
@Override
public void setCompoundDrawables(Drawable left, Drawable top, Drawable right, Drawable 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());
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);
super.setCompoundDrawables(left, top, right, bottom);
tintDrawables();
}
@ -65,10 +65,10 @@ public class NavigationBarButton extends Button {
@Override
public void setCompoundDrawablesRelative(Drawable start, Drawable top, Drawable end,
Drawable 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());
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);
super.setCompoundDrawablesRelative(start, top, end, bottom);
tintDrawables();
}
@ -114,7 +114,7 @@ public class NavigationBarButton extends Button {
if (drawable instanceof TintedDrawable) {
return (TintedDrawable) drawable;
}
return new TintedDrawable(drawable);
return new TintedDrawable(drawable.mutate());
}
private ColorStateList mTintList = null;