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

Commit ed6a3111 authored by Ahaan Ugale's avatar Ahaan Ugale
Browse files

Fix DynamicLayout init to use transformed text length. 

It already uses the transformed text characters, but uses the length of
the base text. This does not account for TransformationMethod2, which
can change length, including AllCapsTransformationMethod ("ß" becomes
"SS") and TranslationTransformationMethod (arbitrary length changes).

This change does not fix updates that happens through
DynamicLayout.ChangeWatcher; those will be fixed in separate change(s).

Bug: 178650596
Test: atest DynamicLayoutBlocksTest DynamicLayoutTest TextLayoutTest \
  TextViewTest
Test: manually on a sample app with AllCaps
Test: manually with Translate on a real app
Change-Id: Iec4699c8d9967cb4622fe59ba91849642d72b52e
parent 2bde0ac1

core/java/android/text/DynamicLayout.java

+3 −3
Original line number Diff line number Diff line
@@ -475,9 +475,8 @@ public class DynamicLayout extends Layout { 


        mObjects.insertAt(0, dirs);



        final int baseLength = mBase.length();

        // Update from 0 characters to whatever the real text is

        reflow(mBase, 0, 0, baseLength);

        // Update from 0 characters to whatever the displayed text is

        reflow(mBase, 0, 0, mDisplay.length());



        if (mBase instanceof Spannable) {

            if (mWatcher == null)
@@ -485,6 +484,7 @@ public class DynamicLayout extends Layout { 


            // Strip out any watchers for other DynamicLayouts.

            final Spannable sp = (Spannable) mBase;

            final int baseLength = mBase.length();

            final ChangeWatcher[] spans = sp.getSpans(0, baseLength, ChangeWatcher.class);

            for (int i = 0; i < spans.length; i++) {

                sp.removeSpan(spans[i]);