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

Commit e631889e authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Fix bug #9073962 - Carret is still on the left with an empty EditText in Arabic Locale 

- fix StaticLayout special case with empty string or new line

Change-Id: Icb51feedce49db661ed17b6907eb0db83d0b763c
parent 97f41383

core/java/android/text/StaticLayout.java

+3 −1
Original line number Diff line number Diff line
@@ -474,6 +474,8 @@ public class StaticLayout extends Layout { 
                mLineCount < mMaximumVisibleLineCount) {

            // Log.e("text", "output last " + bufEnd);



            measured.setPara(source, bufStart, bufEnd, textDir);



            paint.getFontMetricsInt(fm);



            v = out(source,
@@ -482,7 +484,7 @@ public class StaticLayout extends Layout { 
                    v,

                    spacingmult, spacingadd, null,

                    null, fm, false,

                    needMultiply, null, DEFAULT_DIR, true, bufEnd,

                    needMultiply, measured.mLevels, measured.mDir, measured.mEasy, bufEnd,

                    includepad, trackpad, null,

                    null, bufStart, ellipsize,

                    ellipsizedWidth, 0, paint, false);