From 7e8fde62b76ecce383b09aa12667e56c7698e754 Mon Sep 17 00:00:00 2001 From: Chris Banes Date: Wed, 30 Nov 2016 01:25:26 +0000 Subject: [PATCH] am 05e809c8: am 1d18ce0b: am d375274c: am 76c2add1: am 83e76aa2: am c1392c0f: Merge "Mutate FAB backgrounds before tinting" into lmp-mr1-ub-dev * commit '05e809c871b64b9a79381e1f3a0436748f436050': Mutate FAB backgrounds before tinting GitOrigin-RevId=e6044a99864aef98a04e89a7685e859b9fd9bef5 PiperOrigin-RevId: 140549420 --- .../support/design/widget/FloatingActionButtonEclairMr1.java | 2 +- .../support/design/widget/FloatingActionButtonLollipop.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eclair-mr1/android/support/design/widget/FloatingActionButtonEclairMr1.java b/eclair-mr1/android/support/design/widget/FloatingActionButtonEclairMr1.java index 657ad19be..6fb3126b5 100644 --- a/eclair-mr1/android/support/design/widget/FloatingActionButtonEclairMr1.java +++ b/eclair-mr1/android/support/design/widget/FloatingActionButtonEclairMr1.java @@ -68,7 +68,7 @@ class FloatingActionButtonEclairMr1 extends FloatingActionButtonImpl { PorterDuff.Mode backgroundTintMode, int rippleColor, int borderWidth) { // Now we need to tint the original background with the tint, using // an InsetDrawable if we have a border width - mShapeDrawable = DrawableCompat.wrap(originalBackground); + mShapeDrawable = DrawableCompat.wrap(originalBackground.mutate()); DrawableCompat.setTintList(mShapeDrawable, backgroundTint); if (backgroundTintMode != null) { DrawableCompat.setTintMode(mShapeDrawable, backgroundTintMode); diff --git a/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java b/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java index a4404272e..eb4360b35 100644 --- a/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java +++ b/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java @@ -54,7 +54,7 @@ class FloatingActionButtonLollipop extends FloatingActionButtonHoneycombMr1 { void setBackgroundDrawable(Drawable originalBackground, ColorStateList backgroundTint, PorterDuff.Mode backgroundTintMode, int rippleColor, int borderWidth) { // Now we need to tint the original background with the tint - mShapeDrawable = DrawableCompat.wrap(originalBackground); + mShapeDrawable = DrawableCompat.wrap(originalBackground.mutate()); DrawableCompat.setTintList(mShapeDrawable, backgroundTint); if (backgroundTintMode != null) { DrawableCompat.setTintMode(mShapeDrawable, backgroundTintMode);