Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bb97753b: Merge "Switch TextUtils over to new ICU API."

Browse Source 
* commit 'bb97753bc546c7725652b68e6611a75350573466':
  Switch TextUtils over to new ICU API.
This commit is contained in:
Narayan Kamath
2014-07-31 11:34:49 +00:00
committed by Android Git Automerger
parent 5c4b5eded6 bb97753bc5
commit 8b2de134a6
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) {
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.equalsIgnoreCase(ARAB_SCRIPT_SUBTAG) ||