diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2013-08-13 20:13:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-13 20:13:46 +0000 |
| commit | 63113994034e2e71bac40d2de076fa9b1b406960 (patch) | |
| tree | c43dc80ac64fd7afd4eda7447a26d55b17e8f752 /core/java/android/widget/TextView.java | |
| parent | 1beff4787110b92bea5b5c6c8cf67a757a2f0565 (diff) | |
| parent | 404db929c4c2c35d9e6ba7e25152ff357bcd11f9 (diff) | |
Merge "Code cleaning for Drawables" into klp-dev
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 9c21f0d821e9..a315546bb7c8 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -359,9 +359,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener mDrawableRight = mDrawableStart; mDrawableSizeRight = mDrawableSizeStart; mDrawableHeightRight = mDrawableHeightStart; - } - if (mOverride) { mDrawableLeft = mDrawableEnd; mDrawableSizeLeft = mDrawableSizeEnd; mDrawableHeightLeft = mDrawableHeightEnd; @@ -374,9 +372,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener mDrawableLeft = mDrawableStart; mDrawableSizeLeft = mDrawableSizeStart; mDrawableHeightLeft = mDrawableHeightStart; - } - if (mOverride) { mDrawableRight = mDrawableEnd; mDrawableSizeRight = mDrawableSizeEnd; mDrawableHeightRight = mDrawableHeightEnd; |