drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch TextUtils over to new ICU API."

Browse Source
This commit is contained in:
Narayan Kamath
2014-07-31 11:29:56 +00:00
committed by Gerrit Code Review
parent 6a58309e73 08b3516984
commit bb97753bc5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/text/TextUtils.java
View File

@ -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) ||