summaryrefslogtreecommitdiff
path: root/core/java/android/widget/ImageView.java
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2012-09-18 19:23:12 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2012-09-23 14:15:26 -0700
commit4457e85a7090ad51726d50a4daf981d917cceedd (patch)
tree81a4cc8cb4218b96ee97a4e0746a7cad95de0151 /core/java/android/widget/ImageView.java
parent4e7b551fbffa6112821ed6cfeedd6128463fccd0 (diff)
Fix bug #6427629 Clean up layout direction APIs
- canResolveXxx() should be hidden - resetResolvedXxx() should be hidden - resolveDrawables(), resolveLayoutDirection(), resolvePadding(), resolveTextAlignment(), resolveTextDirection() should be hidden - onResolvedXxx() should be merged into one callback - fix also an issue with setting the layout direction of the drawable in ImageView - fix also an issue with checking if TextAlignment can be resolved Change-Id: I1402269ddf8632525f5550f80e5610e1a7b4034d
Diffstat (limited to 'core/java/android/widget/ImageView.java')
-rw-r--r--core/java/android/widget/ImageView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
index 87396fbc13d0..e395ce56a6b1 100644
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -680,7 +680,7 @@ public class ImageView extends View {
d.setState(getDrawableState());
}
d.setLevel(mLevel);
- d.setLayoutDirection(getLayoutDirection());
+ d.setLayoutDirection(getResolvedLayoutDirection());
mDrawableWidth = d.getIntrinsicWidth();
mDrawableHeight = d.getIntrinsicHeight();
applyColorMod();