PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages." am: 1f3a9c0a43

Browse Source 
am: 730d541588

Change-Id: I6b5f29414be17ec8814c8729add689f0672270f0
This commit is contained in:
android-build-prod (mdb)
2018-05-08 11:24:42 -07:00
committed by android-build-merger
parent e5caa4095b 730d541588
commit 6fc9795fbe
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery.cpp
+1 -1
View File
@@ -897,7 +897,7 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) {
case Device::RUN_LOCALE_TEST: { case Device::RUN_LOCALE_TEST: {
ScreenRecoveryUI* screen_ui = static_cast<ScreenRecoveryUI*>(ui); ScreenRecoveryUI* screen_ui = static_cast<ScreenRecoveryUI*>(ui);
screen_ui->CheckBackgroundTextImages(screen_ui->GetLocale()); screen_ui->CheckBackgroundTextImages();
break; break;
} }
case Device::MOUNT_SYSTEM: case Device::MOUNT_SYSTEM:
screen_ui.cpp
+3 -2
View File
@@ -372,7 +372,7 @@ void ScreenRecoveryUI::SelectAndShowBackgroundText(const std::vector<std::string
std::string header = "Show background text image"; std::string header = "Show background text image";
text_y += DrawTextLine(text_x, text_y, header, true); text_y += DrawTextLine(text_x, text_y, header, true);
std::string locale_selection = android::base::StringPrintf( std::string locale_selection = android::base::StringPrintf(
"Current locale: %s, %zu/%zu", locales_entries[sel].c_str(), sel, locales_entries.size()); "Current locale: %s, %zu/%zu", locales_entries[sel].c_str(), sel + 1, locales_entries.size());
// clang-format off // clang-format off
std::vector<std::string> instruction = { std::vector<std::string> instruction = {
locale_selection, locale_selection,
@@ -395,13 +395,14 @@ void ScreenRecoveryUI::SelectAndShowBackgroundText(const std::vector<std::string
pthread_mutex_unlock(&updateMutex); pthread_mutex_unlock(&updateMutex);
} }
void ScreenRecoveryUI::CheckBackgroundTextImages(const std::string& saved_locale) { void ScreenRecoveryUI::CheckBackgroundTextImages() {
// Load a list of locales embedded in one of the resource files. // Load a list of locales embedded in one of the resource files.
std::vector<std::string> locales_entries = get_locales_in_png("installing_text"); std::vector<std::string> locales_entries = get_locales_in_png("installing_text");
if (locales_entries.empty()) { if (locales_entries.empty()) {
Print("Failed to load locales from the resource files\n"); Print("Failed to load locales from the resource files\n");
return; return;
} }
std::string saved_locale = locale_;
size_t selected = 0; size_t selected = 0;
SelectAndShowBackgroundText(locales_entries, selected); SelectAndShowBackgroundText(locales_entries, selected);
screen_ui.h
+3 -3
View File
@@ -148,9 +148,9 @@ class ScreenRecoveryUI : public RecoveryUI {
void SetColor(UIElement e) const; void SetColor(UIElement e) const;
// Check the background text image. Use volume up/down button to cycle through the locales // Checks the background text image, for debugging purpose. It iterates the locales embedded in
// embedded in the png file, and power button to go back to recovery main menu. // the on-device resource files and shows the localized text, for manual inspection.
void CheckBackgroundTextImages(const std::string& saved_locale); void CheckBackgroundTextImages();
protected: protected:
// The margin that we don't want to use for showing texts (e.g. round screen, or screen with // The margin that we don't want to use for showing texts (e.g. round screen, or screen with