Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 63113994: Merge "Code cleaning for Drawables" into klp-dev

Browse Source 
* commit '63113994034e2e71bac40d2de076fa9b1b406960':
  Code cleaning for Drawables
This commit is contained in:
Fabrice Di Meglio
2013-08-13 13:17:38 -07:00
committed by Android Git Automerger
parent 92b0673b60 6311399403
commit 1c97c50cc7
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/TextView.java
View File

@@ -359,9 +359,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mDrawableRight = mDrawableStart; mDrawableRight = mDrawableStart;
mDrawableSizeRight = mDrawableSizeStart; mDrawableSizeRight = mDrawableSizeStart;
mDrawableHeightRight = mDrawableHeightStart; mDrawableHeightRight = mDrawableHeightStart;
}
if (mOverride) {
mDrawableLeft = mDrawableEnd; mDrawableLeft = mDrawableEnd;
mDrawableSizeLeft = mDrawableSizeEnd; mDrawableSizeLeft = mDrawableSizeEnd;
mDrawableHeightLeft = mDrawableHeightEnd; mDrawableHeightLeft = mDrawableHeightEnd;
@@ -374,9 +372,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mDrawableLeft = mDrawableStart; mDrawableLeft = mDrawableStart;
mDrawableSizeLeft = mDrawableSizeStart; mDrawableSizeLeft = mDrawableSizeStart;
mDrawableHeightLeft = mDrawableHeightStart; mDrawableHeightLeft = mDrawableHeightStart;
}
if (mOverride) {
mDrawableRight = mDrawableEnd; mDrawableRight = mDrawableEnd;
mDrawableSizeRight = mDrawableSizeEnd; mDrawableSizeRight = mDrawableSizeEnd;
mDrawableHeightRight = mDrawableHeightEnd; mDrawableHeightRight = mDrawableHeightEnd;