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

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

Merge "Remove hyphens at the ellipsized start/end position"

parents 140e2bb5 5f2c67b8

core/java/android/text/StaticLayout.java

+15 −1
Original line number Diff line number Diff line
@@ -1151,7 +1151,21 @@ public class StaticLayout extends Layout { 
        // TODO: could move TAB to share same column as HYPHEN, simplifying this code and gaining

        // one bit for start field

        lines[off + TAB] |= hasTab ? TAB_MASK : 0;

        if (mEllipsized) {

            if (ellipsize == TextUtils.TruncateAt.START) {

                lines[off + HYPHEN] = packHyphenEdit(Paint.START_HYPHEN_EDIT_NO_EDIT,

                        unpackEndHyphenEdit(hyphenEdit));

            } else if (ellipsize == TextUtils.TruncateAt.END) {

                lines[off + HYPHEN] = packHyphenEdit(unpackStartHyphenEdit(hyphenEdit),

                        Paint.END_HYPHEN_EDIT_NO_EDIT);

            } else {  // Middle and marquee ellipsize should show text at the start/end edge.

                lines[off + HYPHEN] = packHyphenEdit(

                        Paint.START_HYPHEN_EDIT_NO_EDIT, Paint.END_HYPHEN_EDIT_NO_EDIT);

            }

        } else {

            lines[off + HYPHEN] = hyphenEdit;

        }



        lines[off + DIR] |= dir << DIR_SHIFT;

        mLineDirections[j] = measured.getDirections(start - widthStart, end - widthStart);