aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu2017-01-13 17:09:07 -0600
committerandroid-build-merger2017-01-13 17:09:07 -0600
commite05674f93e54a14f982e64adc90b7b75f48f4a73 (patch)
tree3d9523b89e4fca5c538011e954309709409e9893
parenta1e336d548ca78032c7e1d302e112134bfb83ba9 (diff)
parent19e4f627d88b4467a20ead0ea9f9fd8875d97eee (diff)
downloadplatform-bootable-recovery-e05674f93e54a14f982e64adc90b7b75f48f4a73.tar.gz
platform-bootable-recovery-e05674f93e54a14f982e64adc90b7b75f48f4a73.tar.xz
platform-bootable-recovery-e05674f93e54a14f982e64adc90b7b75f48f4a73.zip
Merge "Update background text images in recovery" am: f0af02fea6
am: 19e4f627d8 Change-Id: Ic16111cc970780090827f3e2851e4df874a5d8cf
-rw-r--r--res-hdpi/images/erasing_text.pngbin50373 -> 50680 bytes
-rw-r--r--res-hdpi/images/error_text.pngbin35720 -> 36036 bytes
-rw-r--r--res-hdpi/images/installing_security_text.pngbin111582 -> 113819 bytes
-rw-r--r--res-hdpi/images/installing_text.pngbin102734 -> 104768 bytes
-rw-r--r--res-hdpi/images/no_command_text.pngbin61665 -> 62037 bytes
-rw-r--r--res-mdpi/images/erasing_text.pngbin29558 -> 29898 bytes
-rw-r--r--res-mdpi/images/error_text.pngbin20926 -> 21147 bytes
-rw-r--r--res-mdpi/images/installing_security_text.pngbin69709 -> 70010 bytes
-rw-r--r--res-mdpi/images/installing_text.pngbin61548 -> 61701 bytes
-rw-r--r--res-mdpi/images/no_command_text.pngbin34232 -> 34683 bytes
-rw-r--r--res-xhdpi/images/erasing_text.pngbin72595 -> 73361 bytes
-rw-r--r--res-xhdpi/images/error_text.pngbin51739 -> 52019 bytes
-rw-r--r--res-xhdpi/images/installing_security_text.pngbin195507 -> 196871 bytes
-rw-r--r--res-xhdpi/images/installing_text.pngbin174877 -> 175570 bytes
-rw-r--r--res-xhdpi/images/no_command_text.pngbin85999 -> 86622 bytes
-rw-r--r--res-xxhdpi/images/erasing_text.pngbin119060 -> 121386 bytes
-rw-r--r--res-xxhdpi/images/error_text.pngbin84432 -> 85555 bytes
-rw-r--r--res-xxhdpi/images/installing_security_text.pngbin447442 -> 387979 bytes
-rw-r--r--res-xxhdpi/images/installing_text.pngbin416541 -> 355503 bytes
-rw-r--r--res-xxhdpi/images/no_command_text.pngbin243828 -> 148704 bytes
-rw-r--r--res-xxxhdpi/images/erasing_text.pngbin264753 -> 257605 bytes
-rw-r--r--res-xxxhdpi/images/error_text.pngbin178491 -> 173381 bytes
-rw-r--r--res-xxxhdpi/images/installing_security_text.pngbin611664 -> 620933 bytes
-rw-r--r--res-xxxhdpi/images/installing_text.pngbin569291 -> 581822 bytes
-rw-r--r--res-xxxhdpi/images/no_command_text.pngbin333053 -> 322613 bytes
-rw-r--r--tools/recovery_l10n/src/com/android/recovery_l10n/Main.java22
26 files changed, 20 insertions, 2 deletions
diff --git a/res-hdpi/images/erasing_text.png b/res-hdpi/images/erasing_text.png
index 2186c195..684fc7c6 100644
--- a/res-hdpi/images/erasing_text.png
+++ b/res-hdpi/images/erasing_text.png
Binary files differ
diff --git a/res-hdpi/images/error_text.png b/res-hdpi/images/error_text.png
index 9700f459..00c485d7 100644
--- a/res-hdpi/images/error_text.png
+++ b/res-hdpi/images/error_text.png
Binary files differ
diff --git a/res-hdpi/images/installing_security_text.png b/res-hdpi/images/installing_security_text.png
index 0f605952..dadcfc32 100644
--- a/res-hdpi/images/installing_security_text.png
+++ b/res-hdpi/images/installing_security_text.png
Binary files differ
diff --git a/res-hdpi/images/installing_text.png b/res-hdpi/images/installing_text.png
index ec8b875a..abe73b4b 100644
--- a/res-hdpi/images/installing_text.png
+++ b/res-hdpi/images/installing_text.png
Binary files differ
diff --git a/res-hdpi/images/no_command_text.png b/res-hdpi/images/no_command_text.png
index 3eddcbbe..958e1061 100644
--- a/res-hdpi/images/no_command_text.png
+++ b/res-hdpi/images/no_command_text.png
Binary files differ
diff --git a/res-mdpi/images/erasing_text.png b/res-mdpi/images/erasing_text.png
index b0dd3c6d..10e31782 100644
--- a/res-mdpi/images/erasing_text.png
+++ b/res-mdpi/images/erasing_text.png
Binary files differ
diff --git a/res-mdpi/images/error_text.png b/res-mdpi/images/error_text.png
index 6a47a595..0022d10c 100644
--- a/res-mdpi/images/error_text.png
+++ b/res-mdpi/images/error_text.png
Binary files differ
diff --git a/res-mdpi/images/installing_security_text.png b/res-mdpi/images/installing_security_text.png
index 14993986..7a4cd414 100644
--- a/res-mdpi/images/installing_security_text.png
+++ b/res-mdpi/images/installing_security_text.png
Binary files differ
diff --git a/res-mdpi/images/installing_text.png b/res-mdpi/images/installing_text.png
index 01e9bfef..ee95e569 100644
--- a/res-mdpi/images/installing_text.png
+++ b/res-mdpi/images/installing_text.png
Binary files differ
diff --git a/res-mdpi/images/no_command_text.png b/res-mdpi/images/no_command_text.png
index d340df51..af766090 100644
--- a/res-mdpi/images/no_command_text.png
+++ b/res-mdpi/images/no_command_text.png
Binary files differ
diff --git a/res-xhdpi/images/erasing_text.png b/res-xhdpi/images/erasing_text.png
index 2f8b4691..91cc3587 100644
--- a/res-xhdpi/images/erasing_text.png
+++ b/res-xhdpi/images/erasing_text.png
Binary files differ
diff --git a/res-xhdpi/images/error_text.png b/res-xhdpi/images/error_text.png
index ad18851c..772b139e 100644
--- a/res-xhdpi/images/error_text.png
+++ b/res-xhdpi/images/error_text.png
Binary files differ
diff --git a/res-xhdpi/images/installing_security_text.png b/res-xhdpi/images/installing_security_text.png
index acc6a7c2..a7113a04 100644
--- a/res-xhdpi/images/installing_security_text.png
+++ b/res-xhdpi/images/installing_security_text.png
Binary files differ
diff --git a/res-xhdpi/images/installing_text.png b/res-xhdpi/images/installing_text.png
index 32897d0f..566eb065 100644
--- a/res-xhdpi/images/installing_text.png
+++ b/res-xhdpi/images/installing_text.png
Binary files differ
diff --git a/res-xhdpi/images/no_command_text.png b/res-xhdpi/images/no_command_text.png
index eb43c59c..b8da125c 100644
--- a/res-xhdpi/images/no_command_text.png
+++ b/res-xhdpi/images/no_command_text.png
Binary files differ
diff --git a/res-xxhdpi/images/erasing_text.png b/res-xxhdpi/images/erasing_text.png
index 8ff2b2fc..8e8dfc45 100644
--- a/res-xxhdpi/images/erasing_text.png
+++ b/res-xxhdpi/images/erasing_text.png
Binary files differ
diff --git a/res-xxhdpi/images/error_text.png b/res-xxhdpi/images/error_text.png
index 658d4ea5..7fd1983d 100644
--- a/res-xxhdpi/images/error_text.png
+++ b/res-xxhdpi/images/error_text.png
Binary files differ
diff --git a/res-xxhdpi/images/installing_security_text.png b/res-xxhdpi/images/installing_security_text.png
index 23fcaa44..9779927e 100644
--- a/res-xxhdpi/images/installing_security_text.png
+++ b/res-xxhdpi/images/installing_security_text.png
Binary files differ
diff --git a/res-xxhdpi/images/installing_text.png b/res-xxhdpi/images/installing_text.png
index fd8e5846..fa488960 100644
--- a/res-xxhdpi/images/installing_text.png
+++ b/res-xxhdpi/images/installing_text.png
Binary files differ
diff --git a/res-xxhdpi/images/no_command_text.png b/res-xxhdpi/images/no_command_text.png
index 23932d6b..d72a840e 100644
--- a/res-xxhdpi/images/no_command_text.png
+++ b/res-xxhdpi/images/no_command_text.png
Binary files differ
diff --git a/res-xxxhdpi/images/erasing_text.png b/res-xxxhdpi/images/erasing_text.png
index 03152937..7c198176 100644
--- a/res-xxxhdpi/images/erasing_text.png
+++ b/res-xxxhdpi/images/erasing_text.png
Binary files differ
diff --git a/res-xxxhdpi/images/error_text.png b/res-xxxhdpi/images/error_text.png
index dba127f0..4cd2a8cc 100644
--- a/res-xxxhdpi/images/error_text.png
+++ b/res-xxxhdpi/images/error_text.png
Binary files differ
diff --git a/res-xxxhdpi/images/installing_security_text.png b/res-xxxhdpi/images/installing_security_text.png
index 6cdbef48..d84c5d9a 100644
--- a/res-xxxhdpi/images/installing_security_text.png
+++ b/res-xxxhdpi/images/installing_security_text.png
Binary files differ
diff --git a/res-xxxhdpi/images/installing_text.png b/res-xxxhdpi/images/installing_text.png
index 32511a9c..ffe1474f 100644
--- a/res-xxxhdpi/images/installing_text.png
+++ b/res-xxxhdpi/images/installing_text.png
Binary files differ
diff --git a/res-xxxhdpi/images/no_command_text.png b/res-xxxhdpi/images/no_command_text.png
index b6cdd771..f4f13003 100644
--- a/res-xxxhdpi/images/no_command_text.png
+++ b/res-xxxhdpi/images/no_command_text.png
Binary files differ
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 ac94bde1..30d45f6a 100644
--- a/tools/recovery_l10n/src/com/android/recovery_l10n/Main.java
+++ b/tools/recovery_l10n/src/com/android/recovery_l10n/Main.java
@@ -38,6 +38,7 @@ import java.io.FileOutputStream;
38import java.io.IOException; 38import java.io.IOException;
39import java.util.ArrayList; 39import java.util.ArrayList;
40import java.util.Arrays; 40import java.util.Arrays;
41import java.util.Comparator;
41import java.util.HashMap; 42import java.util.HashMap;
42import java.util.Locale; 43import java.util.Locale;
43 44
@@ -148,11 +149,28 @@ public class Main extends Activity {
148 mText = (TextView) findViewById(R.id.text); 149 mText = (TextView) findViewById(R.id.text);
149 150
150 String[] localeNames = getAssets().getLocales(); 151 String[] localeNames = getAssets().getLocales();
151 Arrays.sort(localeNames); 152 Arrays.sort(localeNames, new Comparator<String>() {
153 // Override the string comparator so that en is sorted behind en_US.
154 // As a result, en_US will be matched first in recovery.
155 @Override
156 public int compare(String s1, String s2) {
157 if (s1.equals(s2)) {
158 return 0;
159 } else if (s1.startsWith(s2)) {
160 return -1;
161 } else if (s2.startsWith(s1)) {
162 return 1;
163 }
164 return s1.compareTo(s2);
165 }
166 });
167
152 ArrayList<Locale> locales = new ArrayList<Locale>(); 168 ArrayList<Locale> locales = new ArrayList<Locale>();
153 for (String localeName : localeNames) { 169 for (String localeName : localeNames) {
154 Log.i(TAG, "locale = " + localeName); 170 Log.i(TAG, "locale = " + localeName);
155 locales.add(Locale.forLanguageTag(localeName)); 171 if (!localeName.isEmpty()) {
172 locales.add(Locale.forLanguageTag(localeName));
173 }
156 } 174 }
157 175
158 final Runnable seq = buildSequence(locales.toArray(new Locale[0])); 176 final Runnable seq = buildSequence(locales.toArray(new Locale[0]));