summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-04-15 18:01:01 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-04-15 18:01:01 +0200
commitc30e7978e591138ccadbf98415e94fb1801f95df (patch)
treec687ae82ee965b2c7d1914357cbf4656ac574914
parentresolve merge conflicts of 8febafa to nyc-dev-plus-aosp (diff)
parentExplicitly set the font face and color. (diff)
downloadandroid_bootable_recovery-c30e7978e591138ccadbf98415e94fb1801f95df.tar
android_bootable_recovery-c30e7978e591138ccadbf98415e94fb1801f95df.tar.gz
android_bootable_recovery-c30e7978e591138ccadbf98415e94fb1801f95df.tar.bz2
android_bootable_recovery-c30e7978e591138ccadbf98415e94fb1801f95df.tar.lz
android_bootable_recovery-c30e7978e591138ccadbf98415e94fb1801f95df.tar.xz
android_bootable_recovery-c30e7978e591138ccadbf98415e94fb1801f95df.tar.zst
android_bootable_recovery-c30e7978e591138ccadbf98415e94fb1801f95df.zip
-rw-r--r--tools/recovery_l10n/res/layout/main.xml4
-rw-r--r--tools/recovery_l10n/src/com/android/recovery_l10n/Main.java9
2 files changed, 6 insertions, 7 deletions
diff --git a/tools/recovery_l10n/res/layout/main.xml b/tools/recovery_l10n/res/layout/main.xml
index 0900b1102..05a16e1e4 100644
--- a/tools/recovery_l10n/res/layout/main.xml
+++ b/tools/recovery_l10n/res/layout/main.xml
@@ -19,7 +19,9 @@
<TextView android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="#ffffffff"
+ android:fontFamily="sans-serif-medium"
+ android:textColor="#fff5f5f5"
+ android:textSize="14sp"
android:background="#ff000000"
android:maxWidth="480px"
android:gravity="center"
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<Locale> locales = new ArrayList<Locale>();
- 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]));