aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorElliott Hughes2016-04-14 19:17:32 -0500
committerElliott Hughes2016-04-14 19:18:41 -0500
commit70ae70b81e452ce8a85dfbb184786c02a9072c23 (patch)
treed71f88598e92abc251b0b4d58a3383a69fca5859 /tools
parent8febafa67e93b2159804b1130a41f15b009de1cd (diff)
downloadplatform-bootable-recovery-70ae70b81e452ce8a85dfbb184786c02a9072c23.tar.gz
platform-bootable-recovery-70ae70b81e452ce8a85dfbb184786c02a9072c23.tar.xz
platform-bootable-recovery-70ae70b81e452ce8a85dfbb184786c02a9072c23.zip
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
Diffstat (limited to 'tools')
-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 0900b110..05a16e1e 100644
--- a/tools/recovery_l10n/res/layout/main.xml
+++ b/tools/recovery_l10n/res/layout/main.xml
@@ -19,7 +19,9 @@
19 <TextView android:id="@+id/text" 19 <TextView android:id="@+id/text"
20 android:layout_width="wrap_content" 20 android:layout_width="wrap_content"
21 android:layout_height="wrap_content" 21 android:layout_height="wrap_content"
22 android:textColor="#ffffffff" 22 android:fontFamily="sans-serif-medium"
23 android:textColor="#fff5f5f5"
24 android:textSize="14sp"
23 android:background="#ff000000" 25 android:background="#ff000000"
24 android:maxWidth="480px" 26 android:maxWidth="480px"
25 android:gravity="center" 27 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 3f2bebe6..817a3ad7 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 {
149 String[] localeNames = getAssets().getLocales(); 149 String[] localeNames = getAssets().getLocales();
150 Arrays.sort(localeNames); 150 Arrays.sort(localeNames);
151 ArrayList<Locale> locales = new ArrayList<Locale>(); 151 ArrayList<Locale> locales = new ArrayList<Locale>();
152 for (String ln : localeNames) { 152 for (String localeName : localeNames) {
153 int u = ln.indexOf('_'); 153 Log.i(TAG, "locale = " + localeName);
154 if (u >= 0) { 154 locales.add(Locale.forLanguageTag(localeName));
155 Log.i(TAG, "locale = " + ln);
156 locales.add(new Locale(ln.substring(0, u), ln.substring(u+1)));
157 }
158 } 155 }
159 156
160 final Runnable seq = buildSequence(locales.toArray(new Locale[0])); 157 final Runnable seq = buildSequence(locales.toArray(new Locale[0]));