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

Commit 7fd36d19 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Reorganize MeasuredText API 

This CL changes the MeasuredText API:
- Rename MeasuredText to PrecomputedText.
- PrecomputedText is no longer a Spanned.
- Introduce PrecomputedText.Param which holds all text layout parameters.
- Add API to get PrecomputedText.Param from TextView.
- Remove MeasuredText.Builder and add PrecomputedText.create method instead.
- Remove setRange from MeasuredText since it is not for normal use case.
  (It can not be used for TextView)

Here is a performance scores: (median, walleye-userdebug, N=20)

StaticLayout creation time (w/o patch -> w/ patch)
 PrecomputedText Balanced Hyphenation  :    743,615 ->    737,145: (-0.9%)
 PrecomputedText Balanced NoHyphenation:    551,544 ->    542,715: (-1.6%)
 PrecomputedText Greedy Hyphenation    :    500,343 ->    499,601: (-0.1%)
 PrecomputedText Greedy NoHyphenation  :    497,987 ->    492,587: (-1.1%)
 RandomText Balanced Hyphenation       : 19,100,592 -> 19,135,289: (+0.2%)
 RandomText Balanced NoHyphenation     :  8,015,088 ->  7,954,260: (-0.8%)
 RandomText Greedy Hyphenation         :  7,950,915 ->  7,877,424: (-0.9%)
 RandomText Greedy NoHyphenation       :  7,939,337 ->  7,863,471: (-1.0%)

PrecomputedText creation time (w/o patch -> w/ patch)
 NoStyled Hyphenation                  : 18,935,638 -> 18,925,422: (-0.1%)
 NoStyled Hyphenation WidthOnly        : 18,469,726 -> 18,978,413: (+2.8%)
 NoStyled NoHyphenation                :  7,940,792 ->  7,919,127: (-0.3%)
 NoStyled NoHyphenation WidthOnly      :  7,463,230 ->  7,922,643: (+6.2%)
 Styled Hyphenation                    : 14,822,501 -> 14,809,017: (-0.1%)
 Styled Hyphenation WidthOnly          : 13,891,770 -> 14,656,617: (+5.5%)
 Styled NoHyphenation                  : 14,511,134 -> 14,301,503: (-1.4%)
 Styled NoHyphenation WidthOnly        : 13,495,345 -> 14,264,314: (+5.7%)

StaticLayout draw time (w/o patch -> w/ patch)
 PrecomputedText NoStyled              :    663,974 ->    661,610: (-0.4%)
 PrecomputedText NoStyled WithoutCache :    648,294 ->    648,766: (+0.1%)
 PrecomputedText Styled                :    879,322 ->    852,770: (-3.0%)
 PrecomputedText Styled WithoutCache   :  1,084,570 ->  1,110,147: (+2.4%)
 RandomText NoStyled                   :    565,682 ->    555,435: (-1.8%)
 RandomText NoStyled WithoutCache      :  9,070,533 ->  9,064,825: (-0.1%)
 RandomText Styled                     :  2,955,202 ->  2,962,008: (+0.2%)
 RandomText Styled WithoutCache        : 12,242,325 -> 12,228,573: (-0.1%)

Bug: 67504091
Bug: 73091756
Test: bit FrameworksCoreTests:android.text.
Test: atest CtsWidgetTestCases:EditTextTest \
    CtsWidgetTestCases:TextViewFadingEdgeTest \
    FrameworksCoreTests:TextViewFallbackLineSpacingTest \
    FrameworksCoreTests:TextViewTest FrameworksCoreTests:TypefaceTest \
    CtsGraphicsTestCases:TypefaceTest CtsWidgetTestCases:TextViewTest \
    CtsTextTestCases
Change-Id: I7db9e2ca4db68a16648cfb8fcf63555f501304c2
parent d3905e65

apct-tests/perftests/core/src/android/text/MeasuredTextMemoryUsageTest.java→apct-tests/perftests/core/src/android/text/PrecomputedTextMemoryUsageTest.java

+34 −22
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import java.util.Random; 


@LargeTest

@RunWith(AndroidJUnit4.class)

public class MeasuredTextMemoryUsageTest {

public class PrecomputedTextMemoryUsageTest {

    private static final int WORD_LENGTH = 9;  // Random word has 9 characters.

    private static final boolean NO_STYLE_TEXT = false;
@@ -53,7 +53,7 @@ public class MeasuredTextMemoryUsageTest { 


    private static int TRIAL_COUNT = 100;



    public MeasuredTextMemoryUsageTest() {}

    public PrecomputedTextMemoryUsageTest() {}



    private TextPerfUtils mTextUtil = new TextPerfUtils();
@@ -77,13 +77,16 @@ public class MeasuredTextMemoryUsageTest { 
    @Test

    public void testMemoryUsage_NoHyphenation() {

        int[] memories = new int[TRIAL_COUNT];

        // Report median of randomly generated MeasuredText.

        for (int i = 0; i < TRIAL_COUNT; ++i) {

            memories[i] = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

        final PrecomputedText.Params param = new PrecomputedText.Params.Builder(PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                .build().getMemoryUsage();

                .build();



        // Report median of randomly generated PrecomputedText.

        for (int i = 0; i < TRIAL_COUNT; ++i) {

            memories[i] = PrecomputedText.create(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), param)

                .getMemoryUsage();

        }

        reportMemoryUsage(median(memories), "MemoryUsage_NoHyphenation");

    }
@@ -91,13 +94,16 @@ public class MeasuredTextMemoryUsageTest { 
    @Test

    public void testMemoryUsage_Hyphenation() {

        int[] memories = new int[TRIAL_COUNT];

        // Report median of randomly generated MeasuredText.

        for (int i = 0; i < TRIAL_COUNT; ++i) {

            memories[i] = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

        final PrecomputedText.Params param = new PrecomputedText.Params.Builder(PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                .build().getMemoryUsage();

                .build();



        // Report median of randomly generated PrecomputedText.

        for (int i = 0; i < TRIAL_COUNT; ++i) {

            memories[i] = PrecomputedText.create(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), param)

                .getMemoryUsage();

        }

        reportMemoryUsage(median(memories), "MemoryUsage_Hyphenation");

    }
@@ -105,13 +111,16 @@ public class MeasuredTextMemoryUsageTest { 
    @Test

    public void testMemoryUsage_NoHyphenation_WidthOnly() {

        int[] memories = new int[TRIAL_COUNT];

        // Report median of randomly generated MeasuredText.

        for (int i = 0; i < TRIAL_COUNT; ++i) {

            memories[i] = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

        final PrecomputedText.Params param = new PrecomputedText.Params.Builder(PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                .build(false /* width only */).getMemoryUsage();

                .build();



        // Report median of randomly generated PrecomputedText.

        for (int i = 0; i < TRIAL_COUNT; ++i) {

            CharSequence cs = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            memories[i] = PrecomputedText.createWidthOnly(cs, param, 0, cs.length())

                .getMemoryUsage();

        }

        reportMemoryUsage(median(memories), "MemoryUsage_NoHyphenation_WidthOnly");

    }
@@ -119,13 +128,16 @@ public class MeasuredTextMemoryUsageTest { 
    @Test

    public void testMemoryUsage_Hyphenatation_WidthOnly() {

        int[] memories = new int[TRIAL_COUNT];

        // Report median of randomly generated MeasuredText.

        for (int i = 0; i < TRIAL_COUNT; ++i) {

            memories[i] = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

        final PrecomputedText.Params param = new PrecomputedText.Params.Builder(PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                .build(false /* width only */).getMemoryUsage();

                .build();



        // Report median of randomly generated PrecomputedText.

        for (int i = 0; i < TRIAL_COUNT; ++i) {

            CharSequence cs = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            memories[i] = PrecomputedText.createWidthOnly(cs, param, 0, cs.length())

                .getMemoryUsage();

        }

        reportMemoryUsage(median(memories), "MemoryUsage_Hyphenation_WidthOnly");

    }

apct-tests/perftests/core/src/android/text/MeasuredTextPerfTest.java→apct-tests/perftests/core/src/android/text/PrecomputedTextPerfTest.java

+50 −34
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import java.util.Random; 


@LargeTest

@RunWith(AndroidJUnit4.class)

public class MeasuredTextPerfTest {

public class PrecomputedTextPerfTest {

    private static final int WORD_LENGTH = 9;  // Random word has 9 characters.

    private static final int WORDS_IN_LINE = 8;  // Roughly, 8 words in a line.

    private static final boolean NO_STYLE_TEXT = false;
@@ -51,7 +51,7 @@ public class MeasuredTextPerfTest { 
    private static TextPaint PAINT = new TextPaint();

    private static final int TEXT_WIDTH = WORDS_IN_LINE * WORD_LENGTH * (int) PAINT.getTextSize();



    public MeasuredTextPerfTest() {}

    public PrecomputedTextPerfTest() {}



    @Rule

    public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
@@ -66,120 +66,136 @@ public class MeasuredTextPerfTest { 
    @Test

    public void testCreate_NoStyled_Hyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final PrecomputedText.Params param = new PrecomputedText.Params.Builder(PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                .build();



        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                    .build(true /* do full layout */);

            PrecomputedText.create(text, param);

        }

    }



    @Test

    public void testCreate_NoStyled_NoHyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final PrecomputedText.Params param = new PrecomputedText.Params.Builder(PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                .build();



        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .build(true /* do full layout */);

            PrecomputedText.create(text, param);

        }

    }



    @Test

    public void testCreate_NoStyled_Hyphenation_WidthOnly() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final PrecomputedText.Params param = new PrecomputedText.Params.Builder(PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                .build();



        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                    .build(false /* width only */);

            PrecomputedText.create(text, param);

        }

    }



    @Test

    public void testCreate_NoStyled_NoHyphenation_WidthOnly() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final PrecomputedText.Params param = new PrecomputedText.Params.Builder(PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                .build();



        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .build(false /* width only */);

            PrecomputedText.create(text, param);

        }

    }



    @Test

    public void testCreate_Styled_Hyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final PrecomputedText.Params param = new PrecomputedText.Params.Builder(PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                .build();



        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                    .build(true /* do full layout */);

            PrecomputedText.create(text, param);

        }

    }



    @Test

    public void testCreate_Styled_NoHyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final PrecomputedText.Params param = new PrecomputedText.Params.Builder(PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                .build();



        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .build(true /* do full layout */);

            PrecomputedText.create(text, param);

        }

    }



    @Test

    public void testCreate_Styled_Hyphenation_WidthOnly() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final PrecomputedText.Params param = new PrecomputedText.Params.Builder(PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                .build();



        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                    .build(false /* width only */);

            PrecomputedText.create(text, param);

        }

    }



    @Test

    public void testCreate_Styled_NoHyphenation_WidthOnly() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final PrecomputedText.Params param = new PrecomputedText.Params.Builder(PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                .build();



        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .build(false /* width only */);

            PrecomputedText.create(text, param);

        }

    }

}

apct-tests/perftests/core/src/android/text/StaticLayoutPerfTest.java

+57 −51
Original line number Diff line number Diff line
@@ -63,6 +63,18 @@ public class StaticLayoutPerfTest { 
        mTextUtil.resetRandom(0 /* seed */);

    }



    private PrecomputedText makeMeasured(CharSequence text, TextPaint paint) {

        PrecomputedText.Params param = new PrecomputedText.Params.Builder(paint).build();

        return PrecomputedText.create(text, param);

    }



    private PrecomputedText makeMeasured(CharSequence text, TextPaint paint, int strategy,

                                      int frequency) {

        PrecomputedText.Params param = new PrecomputedText.Params.Builder(paint)

                .setHyphenationFrequency(frequency).setBreakStrategy(strategy).build();

        return PrecomputedText.create(text, param);

    }



    @Test

    public void testCreate_FixedText_NoStyle_Greedy_NoHyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
@@ -151,18 +163,16 @@ public class StaticLayoutPerfTest { 
    }



    @Test

    public void testCreate_MeasuredText_NoStyled_Greedy_NoHyphenation() {

    public void testCreate_PrecomputedText_NoStyled_Greedy_NoHyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .build();

            final PrecomputedText text = makeMeasured(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT,

                    Layout.BREAK_STRATEGY_SIMPLE, Layout.HYPHENATION_FREQUENCY_NONE);

            state.resumeTiming();



            StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH)

            StaticLayout.Builder.obtain(text, 0, text.getText().length(), PAINT, TEXT_WIDTH)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .build();
@@ -170,18 +180,16 @@ public class StaticLayoutPerfTest { 
    }



    @Test

    public void testCreate_MeasuredText_NoStyled_Greedy_Hyphenation() {

    public void testCreate_PrecomputedText_NoStyled_Greedy_Hyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                    .build();

            final PrecomputedText text = makeMeasured(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT,

                    Layout.BREAK_STRATEGY_SIMPLE, Layout.HYPHENATION_FREQUENCY_NORMAL);

            state.resumeTiming();



            StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH)

            StaticLayout.Builder.obtain(text, 0, text.getText().length(), PAINT, TEXT_WIDTH)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .build();
@@ -189,18 +197,16 @@ public class StaticLayoutPerfTest { 
    }



    @Test

    public void testCreate_MeasuredText_NoStyled_Balanced_NoHyphenation() {

    public void testCreate_PrecomputedText_NoStyled_Balanced_NoHyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .build();

            final PrecomputedText text = makeMeasured(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT,

                    Layout.BREAK_STRATEGY_BALANCED, Layout.HYPHENATION_FREQUENCY_NONE);

            state.resumeTiming();



            StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH)

            StaticLayout.Builder.obtain(text, 0, text.getText().length(), PAINT, TEXT_WIDTH)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                    .build();
@@ -208,18 +214,16 @@ public class StaticLayoutPerfTest { 
    }



    @Test

    public void testCreate_MeasuredText_NoStyled_Balanced_Hyphenation() {

    public void testCreate_PrecomputedText_NoStyled_Balanced_Hyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                    .build();

            final PrecomputedText text = makeMeasured(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT,

                    Layout.BREAK_STRATEGY_BALANCED, Layout.HYPHENATION_FREQUENCY_NORMAL);

            state.resumeTiming();



            StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH)

            StaticLayout.Builder.obtain(text, 0, text.getText().length(), PAINT, TEXT_WIDTH)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                    .build();
@@ -227,18 +231,16 @@ public class StaticLayoutPerfTest { 
    }



    @Test

    public void testCreate_MeasuredText_Styled_Greedy_NoHyphenation() {

    public void testCreate_PrecomputedText_Styled_Greedy_NoHyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT), PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .build();

            final PrecomputedText text = makeMeasured(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT), PAINT,

                    Layout.BREAK_STRATEGY_SIMPLE, Layout.HYPHENATION_FREQUENCY_NONE);

            state.resumeTiming();



            StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH)

            StaticLayout.Builder.obtain(text, 0, text.getText().length(), PAINT, TEXT_WIDTH)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .build();
@@ -328,15 +330,16 @@ public class StaticLayoutPerfTest { 
    }



    @Test

    public void testDraw_MeasuredText_Styled() {

    public void testDraw_PrecomputedText_Styled() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final RenderNode node = RenderNode.create("benchmark", null);

        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT), PAINT).build();

            final PrecomputedText text = makeMeasured(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT), PAINT);

            final StaticLayout layout =

                    StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();

                    StaticLayout.Builder.obtain(

                            text, 0, text.getText().length(), PAINT, TEXT_WIDTH).build();

            final DisplayListCanvas c = node.start(1200, 200);

            state.resumeTiming();
@@ -345,15 +348,16 @@ public class StaticLayoutPerfTest { 
    }



    @Test

    public void testDraw_MeasuredText_NoStyled() {

    public void testDraw_PrecomputedText_NoStyled() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final RenderNode node = RenderNode.create("benchmark", null);

        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT).build();

            final PrecomputedText text = makeMeasured(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT);

            final StaticLayout layout =

                    StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();

                    StaticLayout.Builder.obtain(

                            text, 0, text.getText().length(), PAINT, TEXT_WIDTH).build();

            final DisplayListCanvas c = node.start(1200, 200);

            state.resumeTiming();
@@ -362,15 +366,16 @@ public class StaticLayoutPerfTest { 
    }



    @Test

    public void testDraw_MeasuredText_Styled_WithoutCache() {

    public void testDraw_PrecomputedText_Styled_WithoutCache() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final RenderNode node = RenderNode.create("benchmark", null);

        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT), PAINT).build();

            final PrecomputedText text = makeMeasured(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT), PAINT);

            final StaticLayout layout =

                    StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();

                    StaticLayout.Builder.obtain(

                            text, 0, text.getText().length(), PAINT, TEXT_WIDTH).build();

            final DisplayListCanvas c = node.start(1200, 200);

            Canvas.freeTextLayoutCaches();

            state.resumeTiming();
@@ -380,15 +385,16 @@ public class StaticLayoutPerfTest { 
    }



    @Test

    public void testDraw_MeasuredText_NoStyled_WithoutCache() {

    public void testDraw_PrecomputedText_NoStyled_WithoutCache() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final RenderNode node = RenderNode.create("benchmark", null);

        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT).build();

            final PrecomputedText text = makeMeasured(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT);

            final StaticLayout layout =

                    StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();

                    StaticLayout.Builder.obtain(

                            text, 0, text.getText().length(), PAINT, TEXT_WIDTH).build();

            final DisplayListCanvas c = node.start(1200, 200);

            Canvas.freeTextLayoutCaches();

            state.resumeTiming();

api/current.txt

+31 −30

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/text/BoringLayout.java

+12 −7

File changed.

Preview size limit exceeded, changes collapsed.