diff --git a/res-hdpi/images/erasing_text.png b/res-hdpi/images/erasing_text.png index 2186c195..684fc7c6 100644 Binary files a/res-hdpi/images/erasing_text.png and b/res-hdpi/images/erasing_text.png differ diff --git a/res-hdpi/images/error_text.png b/res-hdpi/images/error_text.png index 9700f459..00c485d7 100644 Binary files a/res-hdpi/images/error_text.png and b/res-hdpi/images/error_text.png differ diff --git a/res-hdpi/images/installing_security_text.png b/res-hdpi/images/installing_security_text.png index 0f605952..dadcfc32 100644 Binary files a/res-hdpi/images/installing_security_text.png and b/res-hdpi/images/installing_security_text.png differ diff --git a/res-hdpi/images/installing_text.png b/res-hdpi/images/installing_text.png index ec8b875a..abe73b4b 100644 Binary files a/res-hdpi/images/installing_text.png and b/res-hdpi/images/installing_text.png differ diff --git a/res-hdpi/images/no_command_text.png b/res-hdpi/images/no_command_text.png index 3eddcbbe..958e1061 100644 Binary files a/res-hdpi/images/no_command_text.png and b/res-hdpi/images/no_command_text.png differ diff --git a/res-mdpi/images/erasing_text.png b/res-mdpi/images/erasing_text.png index b0dd3c6d..10e31782 100644 Binary files a/res-mdpi/images/erasing_text.png and b/res-mdpi/images/erasing_text.png differ diff --git a/res-mdpi/images/error_text.png b/res-mdpi/images/error_text.png index 6a47a595..0022d10c 100644 Binary files a/res-mdpi/images/error_text.png and b/res-mdpi/images/error_text.png differ diff --git a/res-mdpi/images/installing_security_text.png b/res-mdpi/images/installing_security_text.png index 14993986..7a4cd414 100644 Binary files a/res-mdpi/images/installing_security_text.png and b/res-mdpi/images/installing_security_text.png differ diff --git a/res-mdpi/images/installing_text.png b/res-mdpi/images/installing_text.png index 01e9bfef..ee95e569 100644 Binary files a/res-mdpi/images/installing_text.png and b/res-mdpi/images/installing_text.png differ diff --git a/res-mdpi/images/no_command_text.png b/res-mdpi/images/no_command_text.png index d340df51..af766090 100644 Binary files a/res-mdpi/images/no_command_text.png and b/res-mdpi/images/no_command_text.png differ diff --git a/res-xhdpi/images/erasing_text.png b/res-xhdpi/images/erasing_text.png index 2f8b4691..91cc3587 100644 Binary files a/res-xhdpi/images/erasing_text.png and b/res-xhdpi/images/erasing_text.png differ diff --git a/res-xhdpi/images/error_text.png b/res-xhdpi/images/error_text.png index ad18851c..772b139e 100644 Binary files a/res-xhdpi/images/error_text.png and b/res-xhdpi/images/error_text.png differ diff --git a/res-xhdpi/images/installing_security_text.png b/res-xhdpi/images/installing_security_text.png index acc6a7c2..a7113a04 100644 Binary files a/res-xhdpi/images/installing_security_text.png and b/res-xhdpi/images/installing_security_text.png differ diff --git a/res-xhdpi/images/installing_text.png b/res-xhdpi/images/installing_text.png index 32897d0f..566eb065 100644 Binary files a/res-xhdpi/images/installing_text.png and b/res-xhdpi/images/installing_text.png differ diff --git a/res-xhdpi/images/no_command_text.png b/res-xhdpi/images/no_command_text.png index eb43c59c..b8da125c 100644 Binary files a/res-xhdpi/images/no_command_text.png and b/res-xhdpi/images/no_command_text.png differ diff --git a/res-xxhdpi/images/erasing_text.png b/res-xxhdpi/images/erasing_text.png index 8ff2b2fc..8e8dfc45 100644 Binary files a/res-xxhdpi/images/erasing_text.png and b/res-xxhdpi/images/erasing_text.png differ diff --git a/res-xxhdpi/images/error_text.png b/res-xxhdpi/images/error_text.png index 658d4ea5..7fd1983d 100644 Binary files a/res-xxhdpi/images/error_text.png and b/res-xxhdpi/images/error_text.png differ diff --git a/res-xxhdpi/images/installing_security_text.png b/res-xxhdpi/images/installing_security_text.png index 23fcaa44..9779927e 100644 Binary files a/res-xxhdpi/images/installing_security_text.png and b/res-xxhdpi/images/installing_security_text.png differ diff --git a/res-xxhdpi/images/installing_text.png b/res-xxhdpi/images/installing_text.png index fd8e5846..fa488960 100644 Binary files a/res-xxhdpi/images/installing_text.png and b/res-xxhdpi/images/installing_text.png differ diff --git a/res-xxhdpi/images/no_command_text.png b/res-xxhdpi/images/no_command_text.png index 23932d6b..d72a840e 100644 Binary files a/res-xxhdpi/images/no_command_text.png and b/res-xxhdpi/images/no_command_text.png differ diff --git a/res-xxxhdpi/images/erasing_text.png b/res-xxxhdpi/images/erasing_text.png index 03152937..7c198176 100644 Binary files a/res-xxxhdpi/images/erasing_text.png and b/res-xxxhdpi/images/erasing_text.png differ diff --git a/res-xxxhdpi/images/error_text.png b/res-xxxhdpi/images/error_text.png index dba127f0..4cd2a8cc 100644 Binary files a/res-xxxhdpi/images/error_text.png and b/res-xxxhdpi/images/error_text.png differ diff --git a/res-xxxhdpi/images/installing_security_text.png b/res-xxxhdpi/images/installing_security_text.png index 6cdbef48..d84c5d9a 100644 Binary files a/res-xxxhdpi/images/installing_security_text.png and b/res-xxxhdpi/images/installing_security_text.png differ diff --git a/res-xxxhdpi/images/installing_text.png b/res-xxxhdpi/images/installing_text.png index 32511a9c..ffe1474f 100644 Binary files a/res-xxxhdpi/images/installing_text.png and b/res-xxxhdpi/images/installing_text.png differ diff --git a/res-xxxhdpi/images/no_command_text.png b/res-xxxhdpi/images/no_command_text.png index b6cdd771..f4f13003 100644 Binary files a/res-xxxhdpi/images/no_command_text.png and b/res-xxxhdpi/images/no_command_text.png 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; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.HashMap; import java.util.Locale; @@ -148,11 +149,28 @@ public class Main extends Activity { mText = (TextView) findViewById(R.id.text); String[] localeNames = getAssets().getLocales(); - Arrays.sort(localeNames); + Arrays.sort(localeNames, new Comparator() { + // Override the string comparator so that en is sorted behind en_US. + // As a result, en_US will be matched first in recovery. + @Override + public int compare(String s1, String s2) { + if (s1.equals(s2)) { + return 0; + } else if (s1.startsWith(s2)) { + return -1; + } else if (s2.startsWith(s1)) { + return 1; + } + return s1.compareTo(s2); + } + }); + ArrayList locales = new ArrayList(); for (String localeName : localeNames) { Log.i(TAG, "locale = " + localeName); - locales.add(Locale.forLanguageTag(localeName)); + if (!localeName.isEmpty()) { + locales.add(Locale.forLanguageTag(localeName)); + } } final Runnable seq = buildSequence(locales.toArray(new Locale[0]));