| commit | c598b19fdabd0b68fe13ef1507c4607b667c61a3 | [log] [tgz] |
|---|---|---|
| author | Victor Chang <vichang@google.com> | Fri Nov 24 14:52:08 2017 +0000 |
| committer | Victor Chang <vichang@google.com> | Fri Nov 24 18:33:25 2017 +0000 |
| tree | a8e2a49f05c718e59a24fb3311e8a42900c21979 | |
| parent | 2546a8559cd45130bed820eabc02c14e0995e37e [diff] |
Resolve error in StaticLayout_Delegate when compiling with ICU 60 - New method setText(CharSequence) is added in ICU 60 http://icu-project.org/apiref/icu4j/com/ibm/icu/text/BreakIterator.html#setText-java.lang.CharSequence- - javax.swing.text.Segment implements both CharSequence and CharacterIterator - Specify the type to use the old method setText(CharacterIterator) Test: m checkbuild Bug: 69729877 Merged-In: I4ee92791e108cb8de9d8fdaf1ef8484cb846463c Change-Id: I480dfdc835b39d57be4e8de5cd7a1afab8118c68
diff --git a/bridge/src/android/text/StaticLayout_Delegate.java b/bridge/src/android/text/StaticLayout_Delegate.java index cc03143..e8672df 100644 --- a/bridge/src/android/text/StaticLayout_Delegate.java +++ b/bridge/src/android/text/StaticLayout_Delegate.java
@@ -14,6 +14,7 @@ import android.text.StaticLayout.LineBreaks; import java.nio.ByteBuffer; +import java.text.CharacterIterator; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -139,7 +140,7 @@ // compute all possible breakpoints. int length = builder.mWidths.length; BreakIterator it = BreakIterator.getLineInstance(new ULocale(builder.mLocale)); - it.setText(new Segment(builder.mText, 0, length)); + it.setText((CharacterIterator) new Segment(builder.mText, 0, length)); // average word length in english is 5. So, initialize the possible breaks with a guess. List<Integer> breaks = new ArrayList<Integer>((int) Math.ceil(length / 5d));