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

Commit bb97753b authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "Switch TextUtils over to new ICU API."

parents 6a58309e 08b35169

core/java/android/text/TextUtils.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1737,7 +1737,7 @@ public class TextUtils { 
     */

     */

    public static int getLayoutDirectionFromLocale(Locale locale) {

    public static int getLayoutDirectionFromLocale(Locale locale) {

        if (locale != null && !locale.equals(Locale.ROOT)) {

        if (locale != null && !locale.equals(Locale.ROOT)) {

            final String scriptSubtag = ICU.getScript(ICU.addLikelySubtags(locale.toString()));

            final String scriptSubtag = ICU.addLikelySubtags(locale).getScript();

            if (scriptSubtag == null) return getLayoutDirectionFromFirstChar(locale);

            if (scriptSubtag == null) return getLayoutDirectionFromFirstChar(locale);





            if (scriptSubtag.equalsIgnoreCase(ARAB_SCRIPT_SUBTAG) ||

            if (scriptSubtag.equalsIgnoreCase(ARAB_SCRIPT_SUBTAG) ||