diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-06-04 12:55:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-04 12:55:30 -0700 |
| commit | b03b434089cf2106c467b2827a65e5c589c91d01 (patch) | |
| tree | 9222343e85cac935144cc6bd2320a7ce434620ec /core/java/android/widget/ImageView.java | |
| parent | c96132ff53e5c26f5b0170edd85072006fb2bc70 (diff) | |
| download | frameworks_base-b03b434089cf2106c467b2827a65e5c589c91d01.zip frameworks_base-b03b434089cf2106c467b2827a65e5c589c91d01.tar.gz frameworks_base-b03b434089cf2106c467b2827a65e5c589c91d01.tar.bz2 | |
Revert "Revert "Clean up layout direction APIs for Drawable""
This reverts commit c96132ff53e5c26f5b0170edd85072006fb2bc70
Diffstat (limited to 'core/java/android/widget/ImageView.java')
| -rw-r--r-- | core/java/android/widget/ImageView.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index 7593bff..f259597 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -194,12 +194,6 @@ public class ImageView extends View { } @Override - public int getResolvedLayoutDirection(Drawable dr) { - return (dr == mDrawable) ? - getResolvedLayoutDirection() : super.getResolvedLayoutDirection(dr); - } - - @Override public boolean hasOverlappingRendering() { return (getBackground() != null); } @@ -672,6 +666,7 @@ public class ImageView extends View { d.setState(getDrawableState()); } d.setLevel(mLevel); + d.setLayoutDirection(getLayoutDirection()); mDrawableWidth = d.getIntrinsicWidth(); mDrawableHeight = d.getIntrinsicHeight(); applyColorMod(); |