aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu2017-03-22 14:27:26 -0500
committerTianjie Xu2017-03-24 18:54:52 -0500
commit2078b22e4145fef2648cc714eae6588353940c4b (patch)
tree9d93bb7dfa2f4bd9951aaa5fe429a511b1435b33 /recovery.cpp
parentb56a3c2e3afe1e9001e80358c66c66fe2775e42e (diff)
downloadplatform-bootable-recovery-2078b22e4145fef2648cc714eae6588353940c4b.tar.gz
platform-bootable-recovery-2078b22e4145fef2648cc714eae6588353940c4b.tar.xz
platform-bootable-recovery-2078b22e4145fef2648cc714eae6588353940c4b.zip
Add the missing sr-Latn into png files and rename the png locale header
Switch the locale header in the png files from Locale.toString() to Locale.toLanguageTag(). For example, en_US --> en-us and sr__#Latn --> sr-Latn. Also clean up recovery a bit to expect the new locale format. Bug: 35215015 Test: sr-Latn shows correctly under graphic tests && recovery tests pass Change-Id: Ic62bab7756cdc6e5f98f26076f7c2dd046f811db
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/recovery.cpp b/recovery.cpp
index ccb8e5d9..a374eed8 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -122,7 +122,7 @@ static const int BATTERY_READ_TIMEOUT_IN_SEC = 10;
122static const int BATTERY_OK_PERCENTAGE = 20; 122static const int BATTERY_OK_PERCENTAGE = 20;
123static const int BATTERY_WITH_CHARGER_OK_PERCENTAGE = 15; 123static const int BATTERY_WITH_CHARGER_OK_PERCENTAGE = 15;
124static constexpr const char* RECOVERY_WIPE = "/etc/recovery.wipe"; 124static constexpr const char* RECOVERY_WIPE = "/etc/recovery.wipe";
125static constexpr const char* DEFAULT_LOCALE = "en_US"; 125static constexpr const char* DEFAULT_LOCALE = "en-US";
126 126
127static std::string locale; 127static std::string locale;
128static bool has_cache = false; 128static bool has_cache = false;