diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-10 03:25:03 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-10 03:25:03 +0000 |
commit | 6638430404b817d33afee01fe32907f4137d4a7c (patch) | |
tree | 2f7c5429d41f96d333d07e73dca91beb358140ba | |
parent | cfadc69d947c613d52be2ee0a54f78e11e9fd4ae (diff) | |
parent | 79481ab146f666e2bef8ee202899b68cbf7b014c (diff) | |
download | Messaging-6638430404b817d33afee01fe32907f4137d4a7c.tar.gz |
Snap for 9049091 from 79481ab146f666e2bef8ee202899b68cbf7b014c to udc-d1-release
Change-Id: I9d7d81f996c11e3ab283bb3aef9d69933ccc72e9
-rw-r--r-- | src/com/android/messaging/util/SwitchCompatUtils.java | 6 | ||||
-rw-r--r-- | src/com/android/messaging/util/TintDrawableWrapper.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/messaging/util/SwitchCompatUtils.java b/src/com/android/messaging/util/SwitchCompatUtils.java index 8cfe2bc..9c920f6 100644 --- a/src/com/android/messaging/util/SwitchCompatUtils.java +++ b/src/com/android/messaging/util/SwitchCompatUtils.java @@ -21,7 +21,7 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import androidx.appcompat.graphics.drawable.DrawableWrapper; +import androidx.appcompat.graphics.drawable.DrawableWrapperCompat; import androidx.appcompat.widget.SwitchCompat; import android.util.TypedValue; @@ -53,8 +53,8 @@ public class SwitchCompatUtils { private static Drawable getColorTintedDrawable(Drawable oldDrawable, final ColorStateList colorStateList, final PorterDuff.Mode mode) { final int[] thumbState = oldDrawable.isStateful() ? oldDrawable.getState() : null; - if (oldDrawable instanceof DrawableWrapper) { - oldDrawable = ((DrawableWrapper) oldDrawable).getWrappedDrawable(); + if (oldDrawable instanceof DrawableWrapperCompat) { + oldDrawable = ((DrawableWrapperCompat) oldDrawable).getDrawable(); } final Drawable newDrawable = new TintDrawableWrapper(oldDrawable, colorStateList, mode); if (thumbState != null) { diff --git a/src/com/android/messaging/util/TintDrawableWrapper.java b/src/com/android/messaging/util/TintDrawableWrapper.java index 06ee7d4..b426f8c 100644 --- a/src/com/android/messaging/util/TintDrawableWrapper.java +++ b/src/com/android/messaging/util/TintDrawableWrapper.java @@ -20,16 +20,16 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import androidx.appcompat.graphics.drawable.DrawableWrapper; +import androidx.appcompat.graphics.drawable.DrawableWrapperCompat; /* * This is directly copied from v7/appcompat/src/androidx.appcompat.internal/widget/TintManager.java */ /** - * A {@link DrawableWrapper} which updates it's color filter using a {@link ColorStateList}. + * A {@link DrawableWrapperCompat} which updates it's color filter using a {@link ColorStateList}. */ -class TintDrawableWrapper extends DrawableWrapper { +class TintDrawableWrapper extends DrawableWrapperCompat { private final ColorStateList mTintStateList; private final PorterDuff.Mode mTintMode; private int mCurrentColor; |