Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54dacbe7 authored by Yuling Liang's avatar Yuling Liang Committed by Android Git Automerger
Browse files

am 3914a33c: am 26a5c2dd: Merge "Followon fix for 14276128 Clipping at bottom... 

am 3914a33c: am 26a5c2dd: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev

* commit '3914a33c':
  Followon fix for 14276128 Clipping at bottom of TextView
parents 23962cb7 3914a33c

core/java/android/text/BoringLayout.java

+0 −4
Original line number Diff line number Diff line
@@ -188,10 +188,6 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback 
            spacing = metrics.descent - metrics.ascent;

        }



        if (spacingmult != 1 || spacingadd != 0) {

            spacing = (int)(spacing * spacingmult + spacingadd + 0.5f);

        }



        mBottom = spacing;



        if (includepad) {

core/java/android/text/StaticLayout.java

+10 −6
Original line number Diff line number Diff line
@@ -632,7 +632,11 @@ public class StaticLayout extends Layout { 
            bottom = fm.bottom;

        }



        if (j == 0) {

        boolean firstLine = (j == 0);

        boolean currentLineIsTheLastVisibleOne = (j + 1 == mMaximumVisibleLineCount);

        boolean lastLine = currentLineIsTheLastVisibleOne || (end == bufEnd);



        if (firstLine) {

            if (trackPad) {

                mTopPadding = top - above;

            }
@@ -641,7 +645,10 @@ public class StaticLayout extends Layout { 
                above = top;

            }

        }

        if (end == bufEnd) {



        int extra;



        if (lastLine) {

            if (trackPad) {

                mBottomPadding = bottom - below;

            }
@@ -651,9 +658,8 @@ public class StaticLayout extends Layout { 
            }

        }



        int extra;



        if (needMultiply && end != bufEnd) {

        if (needMultiply && !lastLine) {

            double ex = (below - above) * (spacingmult - 1) + spacingadd;

            if (ex >= 0) {

                extra = (int)(ex + EXTRA_ROUNDING);
@@ -690,8 +696,6 @@ public class StaticLayout extends Layout { 
        if (ellipsize != null) {

            // If there is only one line, then do any type of ellipsis except when it is MARQUEE

            // if there are multiple lines, just allow END ellipsis on the last line

            boolean firstLine = (j == 0);

            boolean currentLineIsTheLastVisibleOne = (j + 1 == mMaximumVisibleLineCount);

            boolean forceEllipsis = moreChars && (mLineCount + 1 == mMaximumVisibleLineCount);



            boolean doEllipsis =