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

Commit 3393c82f authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz Committed by Android (Google) Code Review
Browse files

Merge "Use breakstrategy and hypenation properties in ImageFloatingTextView" into udc-qpr-dev

parents 65ffe495 7e440e0e

core/java/com/android/internal/widget/ImageFloatingTextView.java

+4 −2
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ public class ImageFloatingTextView extends TextView { 
    public ImageFloatingTextView(Context context, AttributeSet attrs, int defStyleAttr,

            int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

        setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL_FAST);

        setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY);

    }



    @Override
@@ -83,8 +85,8 @@ public class ImageFloatingTextView extends TextView { 
                .setLineSpacing(getLineSpacingExtra(), getLineSpacingMultiplier())

                .setIncludePad(getIncludeFontPadding())

                .setUseLineSpacingFromFallbacks(true)

                .setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL_FAST);

                .setBreakStrategy(getBreakStrategy())

                .setHyphenationFrequency(getHyphenationFrequency());

        int maxLines;

        if (mMaxLinesForHeight > 0) {

            maxLines = mMaxLinesForHeight;