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

Commit c780128b authored by Raph Levien's avatar Raph Levien Committed by Android Git Automerger
Browse files

am 756b5ff6: am 5ab41065: am 0d18477a: am 75d6197e: am 968f9fdf: Merge... 

am 756b5ff6: am 5ab41065: am 0d18477a: am 75d6197e: am 968f9fdf: Merge "Slightly more precise RTL check in BoringLayout.isBoring()" into mnc-dev

* commit '756b5ff6':
  Slightly more precise RTL check in BoringLayout.isBoring()
parents a3ef6290 756b5ff6

core/java/android/text/BoringLayout.java

+9 −1
Original line number Diff line number Diff line
@@ -269,7 +269,15 @@ public class BoringLayout extends Layout implements TextUtils.EllipsizeCallback 
            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;

                }