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

Author: Fabrice Di Meglio

core/java/android/text/DynamicLayout.java

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

core/java/android/text/StaticLayout.java

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

core/java/android/widget/TextView.java

@@ -6253,7 +6253,7 @@ private Layout makeSingleLayout(int w, BoringLayout.Metrics boring, int ellipsis
             result = new DynamicLayout(mText, mTransformed, mTextPaint, w,
                     alignment, mTextDir, mSpacingMult,
                     mSpacingAdd, mIncludePad, mInput == null ? effectiveEllipsize : null,
-                            ellipsisWidth);
+                            ellipsisWidth, mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE);
         } else {
             if (boring == UNKNOWN_BORING) {
                 boring = BoringLayout.isBoring(mTransformed, mTextPaint, mTextDir, mBoring);