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

Commit 484de9db authored by Raph Levien's avatar Raph Levien Committed by Android (Google) Code Review
Browse files

Merge "Fix for bug 6954231 text wraps on second line and is fused..." into jb-mr1-dev

parents 1795325a 6b558994

core/java/android/widget/Editor.java

+11 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ public class Editor { 
    InputMethodState mInputMethodState;



    DisplayList[] mTextDisplayLists;

    int mLastLayoutHeight;



    boolean mFrozenWithFocus;

    boolean mSelectionMoved;
@@ -1258,6 +1259,16 @@ public class Editor { 
                mTextDisplayLists = new DisplayList[ArrayUtils.idealObjectArraySize(0)];

            }



            // If the height of the layout changes (usually when inserting or deleting a line,

            // but could be changes within a span), invalidate everything. We could optimize

            // more aggressively (for example, adding offsets to blocks) but it would be more

            // complex and we would only get the benefit in some cases.

            int layoutHeight = layout.getHeight();

            if (mLastLayoutHeight != layoutHeight) {

                invalidateTextDisplayList();

                mLastLayoutHeight = layoutHeight;

            }



            DynamicLayout dynamicLayout = (DynamicLayout) layout;

            int[] blockEndLines = dynamicLayout.getBlockEndLines();

            int[] blockIndices = dynamicLayout.getBlockIndices();