summaryrefslogtreecommitdiffstats
path: root/core/java/android/text
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2013-06-18 20:03:41 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2013-06-19 14:45:13 -0700
commite631889e1ae7edc6a2fae495ba504f85820b6a4b (patch)
tree5f1cd6efbcab1db94be44582ce278bd0fef000a1 /core/java/android/text
parent97f41383eb2bb098767ca153e470009fea810540 (diff)
downloadframeworks_base-e631889e1ae7edc6a2fae495ba504f85820b6a4b.zip
frameworks_base-e631889e1ae7edc6a2fae495ba504f85820b6a4b.tar.gz
frameworks_base-e631889e1ae7edc6a2fae495ba504f85820b6a4b.tar.bz2
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
Diffstat (limited to 'core/java/android/text')
-rw-r--r--core/java/android/text/StaticLayout.java4
1 files changed, 3 insertions, 1 deletions
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);