Merge mozilla-central and fx-team

This commit is contained in:
Ed Morley 2014-03-03 14:53:17 +00:00
commit 7c7c9ff618

View File

@ -122,7 +122,7 @@ public class BasicColorPicker extends ListView {
Drawable d = v.getBackground();
d.setColorFilter(getItem(position), PorterDuff.Mode.MULTIPLY);
v.setBackground(d);
v.setBackgroundDrawable(d);
Drawable check = null;
CheckedTextView checked = ((CheckedTextView) v);