From 70ae70b81e452ce8a85dfbb184786c02a9072c23 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 14 Apr 2016 17:17:32 -0700 Subject: Explicitly set the font face and color. This matches what the UI folks asked us to use. Also fix the locale parsing code. Bug: http://b/27837319 Bug: http://b/22465983 Bug: http://b/26548285 Change-Id: I316a6e1f44855313dd983950abf21b543be7ffc0 --- tools/recovery_l10n/src/com/android/recovery_l10n/Main.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'tools/recovery_l10n/src/com/android') diff --git a/tools/recovery_l10n/src/com/android/recovery_l10n/Main.java b/tools/recovery_l10n/src/com/android/recovery_l10n/Main.java index 3f2bebe60..817a3ad7d 100644 --- a/tools/recovery_l10n/src/com/android/recovery_l10n/Main.java +++ b/tools/recovery_l10n/src/com/android/recovery_l10n/Main.java @@ -149,12 +149,9 @@ public class Main extends Activity { String[] localeNames = getAssets().getLocales(); Arrays.sort(localeNames); ArrayList locales = new ArrayList(); - for (String ln : localeNames) { - int u = ln.indexOf('_'); - if (u >= 0) { - Log.i(TAG, "locale = " + ln); - locales.add(new Locale(ln.substring(0, u), ln.substring(u+1))); - } + for (String localeName : localeNames) { + Log.i(TAG, "locale = " + localeName); + locales.add(Locale.forLanguageTag(localeName)); } final Runnable seq = buildSequence(locales.toArray(new Locale[0])); -- cgit v1.2.3