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

am 77b2a861: Merge "Fix padding resolution" into klp-dev

Browse Source 
* commit '77b2a86144365ce3dee557b5c444075c0e0a4033':
  Fix padding resolution
This commit is contained in:
Alan Viverette
2013-08-16 19:02:18 -07:00
committed by Android Git Automerger
parent 725617f66a 77b2a86144
commit 946199a3a8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12076,12 +12076,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @hide * @hide
*/ */
public void resolvePadding() { public void resolvePadding() {
final int resolvedLayoutDirection = getLayoutDirection();
if (!isRtlCompatibilityMode()) { if (!isRtlCompatibilityMode()) {
// Post Jelly Bean MR1 case: we need to take the resolved layout direction into account. // Post Jelly Bean MR1 case: we need to take the resolved layout direction into account.
// If start / end padding are defined, they will be resolved (hence overriding) to // If start / end padding are defined, they will be resolved (hence overriding) to
// left / right or right / left depending on the resolved layout direction. // left / right or right / left depending on the resolved layout direction.
// If start / end padding are not defined, use the left / right ones. // If start / end padding are not defined, use the left / right ones.
int resolvedLayoutDirection = getLayoutDirection();
switch (resolvedLayoutDirection) { switch (resolvedLayoutDirection) {
case LAYOUT_DIRECTION_RTL: case LAYOUT_DIRECTION_RTL:
if (mUserPaddingStart != UNDEFINED_PADDING) { if (mUserPaddingStart != UNDEFINED_PADDING) {
@@ -12110,11 +12111,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
} }
mUserPaddingBottom = (mUserPaddingBottom >= 0) ? mUserPaddingBottom : mPaddingBottom; mUserPaddingBottom = (mUserPaddingBottom >= 0) ? mUserPaddingBottom : mPaddingBottom;
onRtlPropertiesChanged(resolvedLayoutDirection);
} }
internalSetPadding(mUserPaddingLeft, mPaddingTop, mUserPaddingRight, mUserPaddingBottom); internalSetPadding(mUserPaddingLeft, mPaddingTop, mUserPaddingRight, mUserPaddingBottom);
onRtlPropertiesChanged(resolvedLayoutDirection);
mPrivateFlags2 |= PFLAG2_PADDING_RESOLVED; mPrivateFlags2 |= PFLAG2_PADDING_RESOLVED;
} }