summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/java/android/widget/ImageView.java2
-rw-r--r--core/java/android/widget/ProgressBar.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
index 2a0a2f3..4b870ec 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
diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java
index 373a177..ed9114a 100644
--- a/core/java/android/widget/ProgressBar.java
+++ b/core/java/android/widget/ProgressBar.java
@@ -917,8 +917,8 @@ public class ProgressBar extends View {
@Override
public boolean isLayoutRtl(Drawable who) {
- return ((who == mProgressDrawable || who == mIndeterminateDrawable) && isLayoutRtl()) ||
- super.isLayoutRtl(who);
+ return (who == mProgressDrawable || who == mIndeterminateDrawable) ?
+ isLayoutRtl() : super.isLayoutRtl(who);
}
@Override