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

Commit 7b395977 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix the inconsitent paragraph" into main

parents 281ea5ed 77b4dc9b

core/java/android/text/MeasuredParagraph.java

+8 −1
Original line number Original line Diff line number Diff line
@@ -30,6 +30,8 @@ import android.graphics.Paint; 
import android.graphics.Rect;

import android.graphics.Rect;

import android.graphics.text.LineBreakConfig;

import android.graphics.text.LineBreakConfig;

import android.graphics.text.MeasuredText;

import android.graphics.text.MeasuredText;

import android.icu.lang.UCharacter;

import android.icu.lang.UCharacterDirection;

import android.icu.text.Bidi;

import android.icu.text.Bidi;

import android.text.AutoGrowArray.ByteArray;

import android.text.AutoGrowArray.ByteArray;

import android.text.AutoGrowArray.FloatArray;

import android.text.AutoGrowArray.FloatArray;
@@ -711,7 +713,12 @@ public class MeasuredParagraph { 
                // check the paragraph count here and replace the CR letters and re-calculate

                // check the paragraph count here and replace the CR letters and re-calculate

                // BiDi again.

                // BiDi again.

                for (int i = 0; i < mTextLength; ++i) {

                for (int i = 0; i < mTextLength; ++i) {

                    if (mCopiedBuffer[i] == '\r') {

                    if (Character.isSurrogate(mCopiedBuffer[i])) {

                        // All block separators are in BMP.

                        continue;

                    }

                    if (UCharacter.getDirection(mCopiedBuffer[i])

                            == UCharacterDirection.BLOCK_SEPARATOR) {

                        mCopiedBuffer[i] = OBJECT_REPLACEMENT_CHARACTER;

                        mCopiedBuffer[i] = OBJECT_REPLACEMENT_CHARACTER;

                    }

                    }

                }

                }