commit 968f9fdf8b2042b4d7b408f4b2a9db5008eaca6e
author Raph Levien <raph@google.com> Thu Jul 09 19:56:18 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 09 19:56:20 2015 +0000
tree 3c3905169e6d5572d70c6d4a3ded5ebfaebb3f1a
parent 3cc5c24b83edaab66c97b161e25ff0bd93b3e1b4
parent a0419de2a99a61f399da5400bdc229998edce6c2

Merge "Slightly more precise RTL check in BoringLayout.isBoring()" into mnc-dev

core/java/android/text/BoringLayout.java

diff --git a/core/java/android/text/BoringLayout.java b/core/java/android/text/BoringLayout.java
index e78cf8f..aa8b71c 100644
--- a/core/java/android/text/BoringLayout.java
+++ b/core/java/android/text/BoringLayout.java
@@ -269,7 +269,15 @@
             for (int a = 0; a < n; a++) {
                 char c = temp[a];
 
-                if (c == '\n' || c == '\t' || c >= FIRST_RIGHT_TO_LEFT) {
+                if (c == '\n' || c == '\t' ||
+                        (c >= 0x0590 && c <= 0x08FF) ||  // RTL scripts
+                        c == 0x200F ||  // Bidi format character
+                        (c >= 0x202A && c <= 0x202E) ||  // Bidi format characters
+                        (c >= 0x2066 && c <= 0x2069) ||  // Bidi format characters
+                        (c >= 0xD800 && c <= 0xDFFF) ||  // surrogate pairs
+                        (c >= 0xFB1D && c <= 0xFDFF) ||  // Hebrew and Arabic presentation forms
+                        (c >= 0xFE70 && c <= 0xFEFE) // Arabic presentation forms
+                   ) {
                     boring = false;
                     break outer;
                 }