summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/ProgressBar.java
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2011-05-27 14:54:59 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2011-05-27 14:54:59 -0700
commita98eef8601dfd280f56f7a51495ecd4127eefbb2 (patch)
tree4295444b16e5701a4dae41e02ebdebff9ea9281e /core/java/android/widget/ProgressBar.java
parent5ff0f99b23da389f59fe736c4c670c60f13be8ea (diff)
downloadframeworks_base-a98eef8601dfd280f56f7a51495ecd4127eefbb2.zip
frameworks_base-a98eef8601dfd280f56f7a51495ecd4127eefbb2.tar.gz
frameworks_base-a98eef8601dfd280f56f7a51495ecd4127eefbb2.tar.bz2
Fix overrides of isLayoutRtl(Drawable dr)
Change-Id: I7042805747db134d93e39cbb41773d8d5a1cb370
Diffstat (limited to 'core/java/android/widget/ProgressBar.java')
-rw-r--r--core/java/android/widget/ProgressBar.java4
1 files changed, 2 insertions, 2 deletions
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