commit 3393c82f6d79fc35de78fe9c70aff0bb6eb7b817
author Ibrahim Yilmaz <iyz@google.com> Wed Aug 09 14:32:59 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 09 14:32:59 2023 +0000
tree e40e4debaa334e8a2af46cbe7a4adcc82cda54cc
parent 65ffe4959a3a6f8f224cadfbdb4c9f9963103a3e
parent 7e440e0eceaed0c1667ee63abd15c0deb4269687

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

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

diff --git a/core/java/com/android/internal/widget/ImageFloatingTextView.java b/core/java/com/android/internal/widget/ImageFloatingTextView.java
index de10bd2..0704cb8 100644
--- a/core/java/com/android/internal/widget/ImageFloatingTextView.java
+++ b/core/java/com/android/internal/widget/ImageFloatingTextView.java
@@ -63,6 +63,8 @@
     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 @@
                 .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;