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

Merge "Fix bug 4738084 - Padding calculation regression"

Browse Source
This commit is contained in:
Adam Powell
2011-06-20 17:15:45 -07:00
committed by Android (Google) Code Review
parent 5f9b178e5a b53a68bbd9
commit bad9d3a6b6
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/View.java
View File

@@ -2183,12 +2183,6 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
@ViewDebug.ExportedProperty(category = "padding")
int mUserPaddingLeft;
/**
* Cache the paddingTop set by the user to append to the scrollbar's size.
*/
@ViewDebug.ExportedProperty(category = "padding")
int mUserPaddingTop;
/**
* Cache if the user padding is relative.
*
@@ -2890,12 +2884,8 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
// Cache user padding as we cannot fully resolve padding here (we dont have yet the resolved
// layout direction). Those cached values will be used later during padding resolution.
mUserPaddingLeft = leftPadding;
mUserPaddingRight = rightPadding;
mUserPaddingStart = startPadding;
mUserPaddingEnd = endPadding;
mUserPaddingTop = topPadding;
mUserPaddingBottom = bottomPadding;
if (viewFlagMasks != 0) {
setFlags(viewFlagValues, viewFlagMasks);
@@ -8882,7 +8872,6 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
}
}
mPaddingTop = (mUserPaddingTop >= 0) ? mUserPaddingTop : mPaddingTop;
mUserPaddingBottom = (mUserPaddingBottom >= 0) ? mUserPaddingBottom : mPaddingBottom;
recomputePadding();