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

Commit 12e78b45 authored by Siyamed Sinir's avatar Siyamed Sinir Committed by Android (Google) Code Review
Browse files

Merge "StaticLayout capped height should be 0 when maxLines=0"

parents d714a974 a8d982d6

core/java/android/text/StaticLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ public class StaticLayout extends Layout { 


        mLineCount = 0;

        mEllipsized = false;

        mMaxLineHeight = DEFAULT_MAX_LINE_HEIGHT;

        mMaxLineHeight = mMaximumVisibleLineCount < 1 ? 0 : DEFAULT_MAX_LINE_HEIGHT;



        int v = 0;

        boolean needMultiply = (spacingmult != 1 || spacingadd != 0);

core/tests/coretests/src/android/text/StaticLayoutTest.java

+11 −0
Original line number Diff line number Diff line
@@ -937,4 +937,15 @@ public class StaticLayoutTest { 
            destroyFallbackFonts(testFontFiles);

        }

    }



    @Test

    public void testGetHeight_zeroMaxLines() {

        final String text = "a\nb";

        final TextPaint paint = new TextPaint();

        final StaticLayout layout = StaticLayout.Builder.obtain(text, 0, text.length(), paint,

                Integer.MAX_VALUE).setMaxLines(0).build();



        assertEquals(0, layout.getHeight(true));

        assertEquals(2, layout.getLineCount());

    }

}