From c96132ff53e5c26f5b0170edd85072006fb2bc70 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Sat, 2 Jun 2012 05:46:20 -0700
Subject: Revert "Clean up layout direction APIs for Drawable"

This reverts commit c1da65187a4b9de8f72bd617ef937030187c0a92.
---
 core/java/android/widget/ImageView.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'core/java/android/widget/ImageView.java')

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();
-- 
cgit v1.1