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

Commit 2a32771a authored by Raph Levien's avatar Raph Levien Committed by Android Git Automerger
Browse files

am 24871f63: Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev 

* commit '24871f63':
  Fix Text appears on top of existing text when composing in gmail.
parents 77b7f39f 24871f63

core/java/android/text/DynamicLayout.java

+5 −3
Original line number Diff line number Diff line
@@ -502,17 +502,19 @@ public class DynamicLayout extends Layout 
        }



        mNumberOfBlocks = newNumberOfBlocks;

        int newFirstChangedBlock;

        final int deltaLines = newLineCount - (endLine - startLine + 1);

        if (deltaLines != 0) {

            // Display list whose index is >= mIndexFirstChangedBlock is valid

            // but it needs to update its drawing location.

            mIndexFirstChangedBlock = firstBlock + numAddedBlocks;

            for (int i = mIndexFirstChangedBlock; i < mNumberOfBlocks; i++) {

            newFirstChangedBlock = firstBlock + numAddedBlocks;

            for (int i = newFirstChangedBlock; i < mNumberOfBlocks; i++) {

                mBlockEndLines[i] += deltaLines;

            }

        } else {

            mIndexFirstChangedBlock = mNumberOfBlocks;

            newFirstChangedBlock = mNumberOfBlocks;

        }

        mIndexFirstChangedBlock = Math.min(mIndexFirstChangedBlock, newFirstChangedBlock);



        int blockIndex = firstBlock;

        if (createBlockBefore) {