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

Commit 5d6cb0f8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Pass text direction from StaticLayout to Layout"

parents 3f7cd530 158dfafb

core/java/android/text/StaticLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ public class StaticLayout extends Layout { 
                : (b.mText instanceof Spanned)

                    ? new SpannedEllipsizer(b.mText)

                    : new Ellipsizer(b.mText),

                b.mPaint, b.mWidth, b.mAlignment, b.mSpacingMult, b.mSpacingAdd);

                b.mPaint, b.mWidth, b.mAlignment, b.mTextDir, b.mSpacingMult, b.mSpacingAdd);



        if (b.mEllipsize != null) {

            Ellipsizer e = (Ellipsizer) getText();

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

+2 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class StaticLayoutTest { 
    }



    @Test

    public void testBuilder() {

    public void testBuilder_textDirection() {

        {

            // Obtain.

            final StaticLayout.Builder builder = StaticLayout.Builder.obtain(LAYOUT_TEXT, 0,
@@ -88,8 +88,7 @@ public class StaticLayoutTest { 
                    LAYOUT_TEXT.length(), mDefaultPaint, DEFAULT_OUTER_WIDTH);

            builder.setTextDirection(TextDirectionHeuristics.RTL);

            final StaticLayout layout = builder.build();

            // Always returns TextDirectionHeuristics.FIRSTSTRONG_LTR.

            assertEquals(TextDirectionHeuristics.FIRSTSTRONG_LTR,

            assertEquals(TextDirectionHeuristics.RTL,

                    layout.getTextDirectionHeuristic());

        }

    }