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

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

Merge "Use HYPHENATION_FREQUENCY_FULL_FAST" into udc-dev am: 5d975e69 

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



Change-Id: I021a6e75aa12a5245428ea61c76df2aa5c7fbfae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bdadaef9 5d975e69

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -82,7 +82,7 @@ public class ImageFloatingTextView extends TextView { 
                .setIncludePad(getIncludeFontPadding())

                .setIncludePad(getIncludeFontPadding())

                .setUseLineSpacingFromFallbacks(true)

                .setUseLineSpacingFromFallbacks(true)

                .setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY)

                .setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL_FAST);

        int maxLines;

        int maxLines;

        if (mMaxLinesForHeight > 0) {

        if (mMaxLinesForHeight > 0) {

            maxLines = mMaxLinesForHeight;

            maxLines = mMaxLinesForHeight;