Merge "Tint keyguard icons" into pi-dev
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
index 2adb286..7572512 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
@@ -179,7 +179,7 @@
/ (float) iconDrawable.getIntrinsicHeight() * mIconSize);
iconDrawable.setBounds(0, 0, Math.max(width, 1), mIconSize);
}
- button.setCompoundDrawablesRelative(iconDrawable, null, null, null);
+ button.setCompoundDrawables(iconDrawable, null, null, null);
button.setOnClickListener(this);
}
@@ -338,5 +338,27 @@
setMaxLines(1);
setEllipsize(TruncateAt.END);
}
+
+ @Override
+ public void setTextColor(int color) {
+ super.setTextColor(color);
+ updateDrawableColors();
+ }
+
+ @Override
+ public void setCompoundDrawables(Drawable left, Drawable top, Drawable right,
+ Drawable bottom) {
+ super.setCompoundDrawables(left, top, right, bottom);
+ updateDrawableColors();
+ }
+
+ private void updateDrawableColors() {
+ final int color = getCurrentTextColor();
+ for (Drawable drawable : getCompoundDrawables()) {
+ if (drawable != null) {
+ drawable.setTint(color);
+ }
+ }
+ }
}
}