diff options
| author | kirillg <kirillg@google.com> | 2019-04-26 19:09:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-26 19:09:00 +0000 |
| commit | a7ac9c618f2012b42046de1263cb0c1c33bbc4e4 (patch) | |
| tree | 1df38cfaaa4609f6bd8f9531b6604a838dba8256 | |
| parent | 22af1c1e4a93aa18cd00b6927bb57d4a70476672 (diff) | |
| parent | 93f2f2a0e4693b1ab9f024f1d404b1055a90ec3e (diff) | |
| download | support-a7ac9c618f2012b42046de1263cb0c1c33bbc4e4.tar.gz | |
Merge "Use DrawableCompat for drawable layout direction" into androidx-master-dev
| -rw-r--r-- | appcompat/resources/src/main/java/androidx/appcompat/graphics/drawable/DrawableContainer.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/appcompat/resources/src/main/java/androidx/appcompat/graphics/drawable/DrawableContainer.java b/appcompat/resources/src/main/java/androidx/appcompat/graphics/drawable/DrawableContainer.java index d3c9b9aa596..afcfe41e26b 100644 --- a/appcompat/resources/src/main/java/androidx/appcompat/graphics/drawable/DrawableContainer.java +++ b/appcompat/resources/src/main/java/androidx/appcompat/graphics/drawable/DrawableContainer.java @@ -20,8 +20,6 @@ import static android.os.Build.VERSION_CODES.LOLLIPOP; import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX; -import android.annotation.SuppressLint; -import android.annotation.TargetApi; import android.content.res.ColorStateList; import android.content.res.Resources; import android.content.res.Resources.Theme; @@ -35,7 +33,6 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.os.SystemClock; import android.util.DisplayMetrics; -import android.util.LayoutDirection; import android.util.SparseArray; import androidx.annotation.NonNull; @@ -43,6 +40,7 @@ import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.annotation.RestrictTo; import androidx.core.graphics.drawable.DrawableCompat; +import androidx.core.view.ViewCompat; /** * A helper class that contains several {@link Drawable}s and selects which one to use. @@ -100,11 +98,9 @@ class DrawableContainer extends Drawable implements Drawable.Callback { | mDrawableContainerState.getChangingConfigurations(); } - // Remove BanTargetApiAnnotation suppression once b/120623677 is addressed. - @SuppressLint({"WrongConstant", "BanTargetApiAnnotation"}) - @TargetApi(Build.VERSION_CODES.M) private boolean needsMirroring() { - return isAutoMirrored() && getLayoutDirection() == LayoutDirection.RTL; + return isAutoMirrored() + && (DrawableCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL); } @Override |