drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2013-11-12 19:03:48 +00:00
committed by Android (Google) Code Review
parent 8a0d133cd7 82d37b40c5
commit 3f183a234b
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,6 @@ package android.view;
import android.content.ClipData; import android.content.ClipData;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.res.TypedArray; import android.content.res.TypedArray;
@ -3102,7 +3101,15 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*/ */
private static final int UNDEFINED_PADDING = Integer.MIN_VALUE; private static final int UNDEFINED_PADDING = Integer.MIN_VALUE;
private boolean mUseBackgroundPadding = false; /**
* Cache if a left padding has been defined
*/
private boolean mLeftPaddingDefined = false;
/**
* Cache if a right padding has been defined
*/
private boolean mRightPaddingDefined = false;
/** /**
* @hide * @hide
@ -3532,8 +3539,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
int overScrollMode = mOverScrollMode; int overScrollMode = mOverScrollMode;
boolean initializeScrollbars = false; boolean initializeScrollbars = false;
boolean leftPaddingDefined = false;
boolean rightPaddingDefined = false;
boolean startPaddingDefined = false; boolean startPaddingDefined = false;
boolean endPaddingDefined = false; boolean endPaddingDefined = false;
@ -3550,13 +3555,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
padding = a.getDimensionPixelSize(attr, -1); padding = a.getDimensionPixelSize(attr, -1);
mUserPaddingLeftInitial = padding; mUserPaddingLeftInitial = padding;
mUserPaddingRightInitial = padding; mUserPaddingRightInitial = padding;
leftPaddingDefined = true; mLeftPaddingDefined = true;
rightPaddingDefined = true; mRightPaddingDefined = true;
break; break;
case com.android.internal.R.styleable.View_paddingLeft: case com.android.internal.R.styleable.View_paddingLeft:
leftPadding = a.getDimensionPixelSize(attr, -1); leftPadding = a.getDimensionPixelSize(attr, -1);
mUserPaddingLeftInitial = leftPadding; mUserPaddingLeftInitial = leftPadding;
leftPaddingDefined = true; mLeftPaddingDefined = true;
break; break;
case com.android.internal.R.styleable.View_paddingTop: case com.android.internal.R.styleable.View_paddingTop:
topPadding = a.getDimensionPixelSize(attr, -1); topPadding = a.getDimensionPixelSize(attr, -1);
@ -3564,7 +3569,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
case com.android.internal.R.styleable.View_paddingRight: case com.android.internal.R.styleable.View_paddingRight:
rightPadding = a.getDimensionPixelSize(attr, -1); rightPadding = a.getDimensionPixelSize(attr, -1);
mUserPaddingRightInitial = rightPadding; mUserPaddingRightInitial = rightPadding;
rightPaddingDefined = true; mRightPaddingDefined = true;
break; break;
case com.android.internal.R.styleable.View_paddingBottom: case com.android.internal.R.styleable.View_paddingBottom:
bottomPadding = a.getDimensionPixelSize(attr, -1); bottomPadding = a.getDimensionPixelSize(attr, -1);
@ -3884,11 +3889,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
// Padding from the background drawable is stored at this point in mUserPaddingLeftInitial // Padding from the background drawable is stored at this point in mUserPaddingLeftInitial
// and mUserPaddingRightInitial) so drawable padding will be used as ultimate default if // and mUserPaddingRightInitial) so drawable padding will be used as ultimate default if
// defined. // defined.
if (!leftPaddingDefined && startPaddingDefined) { if (!mLeftPaddingDefined && startPaddingDefined) {
leftPadding = startPadding; leftPadding = startPadding;
} }
mUserPaddingLeftInitial = (leftPadding >= 0) ? leftPadding : mUserPaddingLeftInitial; mUserPaddingLeftInitial = (leftPadding >= 0) ? leftPadding : mUserPaddingLeftInitial;
if (!rightPaddingDefined && endPaddingDefined) { if (!mRightPaddingDefined && endPaddingDefined) {
rightPadding = endPadding; rightPadding = endPadding;
} }
mUserPaddingRightInitial = (rightPadding >= 0) ? rightPadding : mUserPaddingRightInitial; mUserPaddingRightInitial = (rightPadding >= 0) ? rightPadding : mUserPaddingRightInitial;
@ -3900,10 +3905,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
// defined. // defined.
final boolean hasRelativePadding = startPaddingDefined || endPaddingDefined; final boolean hasRelativePadding = startPaddingDefined || endPaddingDefined;
if (leftPaddingDefined && !hasRelativePadding) { if (mLeftPaddingDefined && !hasRelativePadding) {
mUserPaddingLeftInitial = leftPadding; mUserPaddingLeftInitial = leftPadding;
} }
if (rightPaddingDefined && !hasRelativePadding) { if (mRightPaddingDefined && !hasRelativePadding) {
mUserPaddingRightInitial = rightPadding; mUserPaddingRightInitial = rightPadding;
} }
} }
@ -12347,15 +12352,19 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
// 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.
if (mBackground != null && mUseBackgroundPadding) { if (mBackground != null && (!mLeftPaddingDefined || !mRightPaddingDefined)) {
Rect padding = sThreadLocal.get(); Rect padding = sThreadLocal.get();
if (padding == null) { if (padding == null) {
padding = new Rect(); padding = new Rect();
sThreadLocal.set(padding); sThreadLocal.set(padding);
} }
mBackground.getPadding(padding); mBackground.getPadding(padding);
mUserPaddingLeftInitial = padding.left; if (!mLeftPaddingDefined) {
mUserPaddingRightInitial = padding.right; mUserPaddingLeftInitial = padding.left;
}
if (!mRightPaddingDefined) {
mUserPaddingRightInitial = padding.right;
}
} }
switch (resolvedLayoutDirection) { switch (resolvedLayoutDirection) {
case LAYOUT_DIRECTION_RTL: case LAYOUT_DIRECTION_RTL:
@ -15352,9 +15361,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
mUserPaddingRightInitial = padding.right; mUserPaddingRightInitial = padding.right;
internalSetPadding(padding.left, padding.top, padding.right, padding.bottom); internalSetPadding(padding.left, padding.top, padding.right, padding.bottom);
} }
mUseBackgroundPadding = true;
} else {
mUseBackgroundPadding = false;
} }
// Compare the minimum sizes of the old Drawable and the new. If there isn't an old or // Compare the minimum sizes of the old Drawable and the new. If there isn't an old or
@ -15380,8 +15386,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
/* Remove the background */ /* Remove the background */
mBackground = null; mBackground = null;
mUseBackgroundPadding = false;
if ((mPrivateFlags & PFLAG_ONLY_DRAWS_BACKGROUND) != 0) { if ((mPrivateFlags & PFLAG_ONLY_DRAWS_BACKGROUND) != 0) {
/* /*
* This view ONLY drew the background before and we're removing * This view ONLY drew the background before and we're removing
@ -15453,8 +15457,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
mUserPaddingLeftInitial = left; mUserPaddingLeftInitial = left;
mUserPaddingRightInitial = right; mUserPaddingRightInitial = right;
mUseBackgroundPadding = false;
internalSetPadding(left, top, right, bottom); internalSetPadding(left, top, right, bottom);
} }
@ -15541,8 +15543,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
mUserPaddingStart = start; mUserPaddingStart = start;
mUserPaddingEnd = end; mUserPaddingEnd = end;
mUseBackgroundPadding = false;
switch(getLayoutDirection()) { switch(getLayoutDirection()) {
case LAYOUT_DIRECTION_RTL: case LAYOUT_DIRECTION_RTL:
mUserPaddingLeftInitial = end; mUserPaddingLeftInitial = end;