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

Commit e09c3e3a authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz Committed by Automerger Merge Worker
Browse files

Merge "Use breakstrategy and hypenation properties in ImageFloatingTextView"... 

Merge "Use breakstrategy and hypenation properties in ImageFloatingTextView" into udc-qpr-dev am: 3393c82f am: 177d30b9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24359313



Change-Id: I639391888fe90a6972eb9218aa105b3937526763
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21b0c5d1 177d30b9

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;