diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-05-27 15:35:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-27 15:35:12 -0700 |
| commit | 6e10b08ba9ac7ba4ee1884f9e5cccfd509d76165 (patch) | |
| tree | d89735f64a5d2059c0b31c5fa3196d10ac435dc5 /core | |
| parent | 0d54201b1e70f1a970f0f58338db88d51333d3e6 (diff) | |
| parent | a98eef8601dfd280f56f7a51495ecd4127eefbb2 (diff) | |
| download | frameworks_base-6e10b08ba9ac7ba4ee1884f9e5cccfd509d76165.zip frameworks_base-6e10b08ba9ac7ba4ee1884f9e5cccfd509d76165.tar.gz frameworks_base-6e10b08ba9ac7ba4ee1884f9e5cccfd509d76165.tar.bz2 | |
Merge "Fix overrides of isLayoutRtl(Drawable dr)"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/ImageView.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/ProgressBar.java | 4 |
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 |