diff options
| -rw-r--r-- | install.cpp | 6 | ||||
| -rw-r--r-- | res-xxhdpi/images/erasing_text.png | bin | 121386 -> 121608 bytes | |||
| -rw-r--r-- | res-xxhdpi/images/error_text.png | bin | 85555 -> 84727 bytes | |||
| -rw-r--r-- | res-xxhdpi/images/installing_security_text.png | bin | 387979 -> 447158 bytes | |||
| -rw-r--r-- | res-xxhdpi/images/installing_text.png | bin | 355503 -> 415889 bytes | |||
| -rw-r--r-- | res-xxhdpi/images/no_command_text.png | bin | 148704 -> 243028 bytes | |||
| -rw-r--r-- | res-xxxhdpi/images/erasing_text.png | bin | 257605 -> 263768 bytes | |||
| -rw-r--r-- | res-xxxhdpi/images/error_text.png | bin | 173381 -> 176936 bytes | |||
| -rw-r--r-- | res-xxxhdpi/images/installing_security_text.png | bin | 620933 -> 610107 bytes | |||
| -rw-r--r-- | res-xxxhdpi/images/installing_text.png | bin | 581822 -> 567834 bytes | |||
| -rw-r--r-- | res-xxxhdpi/images/no_command_text.png | bin | 322613 -> 331159 bytes | |||
| -rw-r--r-- | tools/recovery_l10n/README.md | 3 | ||||
| -rw-r--r-- | update_verifier/update_verifier.cpp | 2 | ||||
| -rw-r--r-- | updater/install.cpp | 1 | ||||
| -rw-r--r-- | updater/updater.cpp | 1 |
15 files changed, 5 insertions, 8 deletions
diff --git a/install.cpp b/install.cpp index 9bb1216cf..553ebae10 100644 --- a/install.cpp +++ b/install.cpp @@ -420,11 +420,7 @@ static int try_update_binary(const char* path, ZipArchiveHandle zip, bool* wipe_ LOG(ERROR) << "invalid \"set_progress\" parameters: " << line; } } else if (command == "ui_print") { - if (!args.empty()) { - ui->PrintOnScreenOnly("%s", args.c_str()); - } else { - ui->PrintOnScreenOnly("\n"); - } + ui->PrintOnScreenOnly("%s\n", args.c_str()); fflush(stdout); } else if (command == "wipe_cache") { *wipe_cache = true; diff --git a/res-xxhdpi/images/erasing_text.png b/res-xxhdpi/images/erasing_text.png Binary files differindex 8e8dfc450..86693f435 100644 --- a/res-xxhdpi/images/erasing_text.png +++ b/res-xxhdpi/images/erasing_text.png diff --git a/res-xxhdpi/images/error_text.png b/res-xxhdpi/images/error_text.png Binary files differindex 7fd1983d5..9c4bcab95 100644 --- a/res-xxhdpi/images/error_text.png +++ b/res-xxhdpi/images/error_text.png diff --git a/res-xxhdpi/images/installing_security_text.png b/res-xxhdpi/images/installing_security_text.png Binary files differindex 9779927ef..f5ec698f8 100644 --- a/res-xxhdpi/images/installing_security_text.png +++ b/res-xxhdpi/images/installing_security_text.png diff --git a/res-xxhdpi/images/installing_text.png b/res-xxhdpi/images/installing_text.png Binary files differindex fa488960e..100a5b303 100644 --- a/res-xxhdpi/images/installing_text.png +++ b/res-xxhdpi/images/installing_text.png diff --git a/res-xxhdpi/images/no_command_text.png b/res-xxhdpi/images/no_command_text.png Binary files differindex d72a840e9..590030c8b 100644 --- a/res-xxhdpi/images/no_command_text.png +++ b/res-xxhdpi/images/no_command_text.png diff --git a/res-xxxhdpi/images/erasing_text.png b/res-xxxhdpi/images/erasing_text.png Binary files differindex 7c198176d..4cf5d76e8 100644 --- a/res-xxxhdpi/images/erasing_text.png +++ b/res-xxxhdpi/images/erasing_text.png diff --git a/res-xxxhdpi/images/error_text.png b/res-xxxhdpi/images/error_text.png Binary files differindex 4cd2a8cc4..8dd6f1236 100644 --- a/res-xxxhdpi/images/error_text.png +++ b/res-xxxhdpi/images/error_text.png diff --git a/res-xxxhdpi/images/installing_security_text.png b/res-xxxhdpi/images/installing_security_text.png Binary files differindex d84c5d9a9..fa06f3147 100644 --- a/res-xxxhdpi/images/installing_security_text.png +++ b/res-xxxhdpi/images/installing_security_text.png diff --git a/res-xxxhdpi/images/installing_text.png b/res-xxxhdpi/images/installing_text.png Binary files differindex ffe1474f9..d0f930160 100644 --- a/res-xxxhdpi/images/installing_text.png +++ b/res-xxxhdpi/images/installing_text.png diff --git a/res-xxxhdpi/images/no_command_text.png b/res-xxxhdpi/images/no_command_text.png Binary files differindex f4f13003b..233aec468 100644 --- a/res-xxxhdpi/images/no_command_text.png +++ b/res-xxxhdpi/images/no_command_text.png diff --git a/tools/recovery_l10n/README.md b/tools/recovery_l10n/README.md index 1554f6618..e9e85d65f 100644 --- a/tools/recovery_l10n/README.md +++ b/tools/recovery_l10n/README.md @@ -8,6 +8,9 @@ * For example, we can use Nexus 5 to generate the text images under res-xxhdpi. + * We can set up the maximum width of the final png image in res/layout/main.xml + Currently, the image width is 1200px for xxxhdpi, 900px for xxhdpi and + 480px for xhdpi/hdpi/mdpi. * When using the emulator, make sure the NDK version matches the current repository. Otherwise, the app may not work properly. diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp index e97a3adba..7087671e0 100644 --- a/update_verifier/update_verifier.cpp +++ b/update_verifier/update_verifier.cpp @@ -147,7 +147,7 @@ int main(int argc, char** argv) { LOG(INFO) << "Started with arg " << i << ": " << argv[i]; } - sp<IBootControl> module = IBootControl::getService("bootctrl"); + sp<IBootControl> module = IBootControl::getService(); if (module == nullptr) { LOG(ERROR) << "Error getting bootctrl module."; return -1; diff --git a/updater/install.cpp b/updater/install.cpp index 643145447..7a8e92f6c 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -76,7 +76,6 @@ static void uiPrint(State* state, const std::string& buffer) { for (auto& line : lines) { if (!line.empty()) { fprintf(ui->cmd_pipe, "ui_print %s\n", line.c_str()); - fprintf(ui->cmd_pipe, "ui_print\n"); } } diff --git a/updater/updater.cpp b/updater/updater.cpp index 473066263..22c060fcb 100644 --- a/updater/updater.cpp +++ b/updater/updater.cpp @@ -191,7 +191,6 @@ int main(int argc, char** argv) { } fprintf(cmd_pipe, "ui_print %s\n", line.c_str()); } - fprintf(cmd_pipe, "ui_print\n"); } if (state.error_code != kNoError) { |
