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

Commit 4d32573e authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Fix the mixing of the parenthesis and numbers in RTL paragraphs." into gingerbread

parents d732eddf 405956bd

core/java/android/text/StaticLayout.java

+6 −2
Original line number Diff line number Diff line
@@ -738,7 +738,8 @@ extends Layout 
            // add condition if the separator is a space

            else if (isSpace && prev != SOR &&

                            (   next == Character.DIRECTIONALITY_EUROPEAN_NUMBER

                             || next == Character.DIRECTIONALITY_ARABIC_NUMBER  ) ) {

                             || next == Character.DIRECTIONALITY_ARABIC_NUMBER

                             || next == Character.DIRECTIONALITY_OTHER_NEUTRALS) ) {

                chInfo[j] = SOR;

                for (int k=j+1; k < n; ++k) {

                    if (chInfo[k] == Character.DIRECTIONALITY_LEFT_TO_RIGHT) {
@@ -824,6 +825,8 @@ extends Layout 
            } else if (d == Character.DIRECTIONALITY_EUROPEAN_NUMBER ||

                       d == Character.DIRECTIONALITY_ARABIC_NUMBER) {

                cur = Character.DIRECTIONALITY_LEFT_TO_RIGHT;

            } else if (d == Character.DIRECTIONALITY_OTHER_NEUTRALS) {

               chInfo[j] = cur = SOR;

            } else {

                byte dd = SOR;

                int k;
@@ -832,7 +835,8 @@ extends Layout 
                    dd = chInfo[k];



                    if (dd == Character.DIRECTIONALITY_LEFT_TO_RIGHT ||

                        dd == Character.DIRECTIONALITY_RIGHT_TO_LEFT) {

                        dd == Character.DIRECTIONALITY_RIGHT_TO_LEFT ||

                        dd == Character.DIRECTIONALITY_OTHER_NEUTRALS) {

                        break;

                    }

                    if (dd == Character.DIRECTIONALITY_EUROPEAN_NUMBER ||