diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-02 05:46:20 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2012-06-02 05:46:20 -0700 |
commit | c96132ff53e5c26f5b0170edd85072006fb2bc70 (patch) | |
tree | 672fc65ce1e5d7766fd4ba947363aef345318982 /core/java/android/widget/ImageView.java | |
parent | 78068825416a4a0f3b2fdf57491ba4932c2bb6c4 (diff) | |
download | frameworks_base-c96132ff53e5c26f5b0170edd85072006fb2bc70.zip frameworks_base-c96132ff53e5c26f5b0170edd85072006fb2bc70.tar.gz frameworks_base-c96132ff53e5c26f5b0170edd85072006fb2bc70.tar.bz2 |
Revert "Clean up layout direction APIs for Drawable"
This reverts commit c1da65187a4b9de8f72bd617ef937030187c0a92.
Diffstat (limited to 'core/java/android/widget/ImageView.java')
-rw-r--r-- | core/java/android/widget/ImageView.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index f259597..7593bff 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -194,6 +194,12 @@ 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); } @@ -666,7 +672,6 @@ public class ImageView extends View { d.setState(getDrawableState()); } d.setLevel(mLevel); - d.setLayoutDirection(getLayoutDirection()); mDrawableWidth = d.getIntrinsicWidth(); mDrawableHeight = d.getIntrinsicHeight(); applyColorMod(); |