From e631889e1ae7edc6a2fae495ba504f85820b6a4b Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Tue, 18 Jun 2013 20:03:41 -0700 Subject: 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 --- core/java/android/text/StaticLayout.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/java/android/text') diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 1291279..e7d6fda 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -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); -- cgit v1.1