From a98eef8601dfd280f56f7a51495ecd4127eefbb2 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Fri, 27 May 2011 14:54:59 -0700
Subject: Fix overrides of isLayoutRtl(Drawable dr)

Change-Id: I7042805747db134d93e39cbb41773d8d5a1cb370
---
 core/java/android/widget/ImageView.java | 2 +-
 1 file changed, 1 insertion(+), 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 2a0a2f39a5a0..4b870ec2d10b 100644
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -188,7 +188,7 @@ public class ImageView extends View {
 
     @Override
     public boolean isLayoutRtl(Drawable dr) {
-        return ((dr == mDrawable) && isLayoutRtl()) || super.isLayoutRtl(dr);
+        return (dr == mDrawable) ? isLayoutRtl() : super.isLayoutRtl(dr);
     }
 
     @Override
-- 
cgit v1.2.3