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

Merge "Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)""

Browse Source
This commit is contained in:
Fabrice Di Meglio
2011-10-04 17:24:37 -07:00
committed by Android (Google) Code Review
parent 63f5e09c8c ad0b051b13
commit e921572bda
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/text/DynamicLayout.java
View File

@@ -76,7 +76,7 @@ extends Layout
boolean includepad, boolean includepad,
TextUtils.TruncateAt ellipsize, int ellipsizedWidth) { TextUtils.TruncateAt ellipsize, int ellipsizedWidth) {
this(base, display, paint, width, align, TextDirectionHeuristics.FIRSTSTRONG_LTR, this(base, display, paint, width, align, TextDirectionHeuristics.FIRSTSTRONG_LTR,
spacingmult, spacingadd, includepad, ellipsize, ellipsizedWidth, Integer.MAX_VALUE); spacingmult, spacingadd, includepad, ellipsize, ellipsizedWidth);
} }
/** /**
@@ -93,7 +93,7 @@ extends Layout
int width, Alignment align, TextDirectionHeuristic textDir, int width, Alignment align, TextDirectionHeuristic textDir,
float spacingmult, float spacingadd, float spacingmult, float spacingadd,
boolean includepad, boolean includepad,
TextUtils.TruncateAt ellipsize, int ellipsizedWidth, int maxLines) { TextUtils.TruncateAt ellipsize, int ellipsizedWidth) {
super((ellipsize == null) super((ellipsize == null)
? display ? display
: (display instanceof Spanned) : (display instanceof Spanned)
@@ -135,8 +135,6 @@ extends Layout
mEllipsize = true; mEllipsize = true;
} }
mMaxLines = maxLines;
// Initial state is a single line with 0 characters (0 to 0), // Initial state is a single line with 0 characters (0 to 0),
// with top at 0 and bottom at whatever is natural, and // with top at 0 and bottom at whatever is natural, and
// undefined ellipsis. // undefined ellipsis.
@@ -285,7 +283,7 @@ extends Layout
reflowed.generate(text, where, where + after, reflowed.generate(text, where, where + after,
getPaint(), getWidth(), getAlignment(), getTextDirectionHeuristic(), getPaint(), getWidth(), getAlignment(), getTextDirectionHeuristic(),
getSpacingMultiplier(), getSpacingAdd(), getSpacingMultiplier(), getSpacingAdd(),
false, true, mEllipsizedWidth, mEllipsizeAt, mMaxLines); false, true, mEllipsizedWidth, mEllipsizeAt);
int n = reflowed.getLineCount(); int n = reflowed.getLineCount();
// If the new layout has a blank line at the end, but it is not // If the new layout has a blank line at the end, but it is not
@@ -490,8 +488,6 @@ extends Layout
private int mTopPadding, mBottomPadding; private int mTopPadding, mBottomPadding;
private int mMaxLines;
private static StaticLayout sStaticLayout = new StaticLayout(null); private static StaticLayout sStaticLayout = new StaticLayout(null);
private static final Object[] sLock = new Object[0]; private static final Object[] sLock = new Object[0];

10
core/java/android/text/StaticLayout.java
View File

@@ -139,7 +139,7 @@ public class StaticLayout extends Layout {
generate(source, bufstart, bufend, paint, outerwidth, align, textDir, generate(source, bufstart, bufend, paint, outerwidth, align, textDir,
spacingmult, spacingadd, includepad, includepad, spacingmult, spacingadd, includepad, includepad,
ellipsizedWidth, ellipsize, mMaximumVisibleLineCount); ellipsizedWidth, ellipsize);
mMeasured = MeasuredText.recycle(mMeasured); mMeasured = MeasuredText.recycle(mMeasured);
mFontMetricsInt = null; mFontMetricsInt = null;
@@ -160,7 +160,7 @@ public class StaticLayout extends Layout {
Alignment align, TextDirectionHeuristic textDir, Alignment align, TextDirectionHeuristic textDir,
float spacingmult, float spacingadd, float spacingmult, float spacingadd,
boolean includepad, boolean trackpad, boolean includepad, boolean trackpad,
float ellipsizedWidth, TextUtils.TruncateAt ellipsize, int maxLines) { float ellipsizedWidth, TextUtils.TruncateAt ellipsize) {
mLineCount = 0; mLineCount = 0;
int v = 0; int v = 0;
@@ -477,13 +477,13 @@ public class StaticLayout extends Layout {
width = restWidth; width = restWidth;
} }
} }
if (mLineCount >= maxLines) { if (mLineCount >= mMaximumVisibleLineCount) {
break; break;
} }
} }
} }
if (paraEnd != here && mLineCount < maxLines) { if (paraEnd != here && mLineCount < mMaximumVisibleLineCount) {
if ((fitTop | fitBottom | fitDescent | fitAscent) == 0) { if ((fitTop | fitBottom | fitDescent | fitAscent) == 0) {
paint.getFontMetricsInt(fm); paint.getFontMetricsInt(fm);
@@ -514,7 +514,7 @@ public class StaticLayout extends Layout {
} }
if ((bufEnd == bufStart || source.charAt(bufEnd - 1) == CHAR_NEW_LINE) && if ((bufEnd == bufStart || source.charAt(bufEnd - 1) == CHAR_NEW_LINE) &&
mLineCount < maxLines) { mLineCount < mMaximumVisibleLineCount) {
// Log.e("text", "output last " + bufEnd); // Log.e("text", "output last " + bufEnd);
paint.getFontMetricsInt(fm); paint.getFontMetricsInt(fm);

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

@@ -6262,7 +6262,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
result = new DynamicLayout(mText, mTransformed, mTextPaint, w, result = new DynamicLayout(mText, mTransformed, mTextPaint, w,
alignment, mTextDir, mSpacingMult, alignment, mTextDir, mSpacingMult,
mSpacingAdd, mIncludePad, mInput == null ? effectiveEllipsize : null, mSpacingAdd, mIncludePad, mInput == null ? effectiveEllipsize : null,
ellipsisWidth, mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE); ellipsisWidth);
} else { } else {
if (boring == UNKNOWN_BORING) { if (boring == UNKNOWN_BORING) {
boring = BoringLayout.isBoring(mTransformed, mTextPaint, mTextDir, mBoring); boring = BoringLayout.isBoring(mTransformed, mTextPaint, mTextDir, mBoring);