From c51ac89f0ee5d4a0dd8edebc134a924f83738140 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 20 Mar 2015 18:22:15 -0700 Subject: Add "Apply update from sdcard" to default recovery image. At the moment, this is the only difference in the sprout recovery image. That's silly. Let's just improve the error handling slightly and always have this option present. Also make the obscure "<3e>" less unclear. Also use "power button" as the default text rather than "enter button", because it's been years since anyone had one of those. (Longer term we should let subclassers tell us the keycode and we translate it to the correct string.) Also move the two "Reboot" options together, put "Power off" at the bottom (and use that terminology, like the real UI, rather than "Power down"), and use capitals throughout. Finally, add a README.md with some useful instructions. Change-Id: I94fb19f73d79c54fed2dda30cefb884426641b5c --- recovery.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'recovery.cpp') diff --git a/recovery.cpp b/recovery.cpp index 07606137b..641f36f3e 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -512,7 +512,7 @@ prepend_title(const char* const* headers) { const char** new_headers = (const char**)malloc((count+1) * sizeof(char*)); const char** h = new_headers; - *(h++) = "Android system recovery <" EXPAND(RECOVERY_API_VERSION) "e>"; + *(h++) = "Android system recovery (API " EXPAND(RECOVERY_API_VERSION) ")"; *(h++) = recovery_version; *(h++) = ""; for (p = headers; *p; ++p, ++h) *h = *p; @@ -877,7 +877,11 @@ prompt_and_wait(Device* device, int status) { break; case Device::APPLY_EXT: { - ensure_path_mounted(SDCARD_ROOT); + if (ensure_path_mounted(SDCARD_ROOT) != 0) { + ui->Print("\n-- Couldn't mount %s.\n", SDCARD_ROOT); + break; + } + char* path = browse_directory(SDCARD_ROOT, device); if (path == NULL) { ui->Print("\n-- No package file selected.\n", path); @@ -910,7 +914,7 @@ prompt_and_wait(Device* device, int status) { } else if (!ui->IsTextVisible()) { return Device::NO_ACTION; // reboot if logs aren't visible } else { - ui->Print("\nInstall from sdcard complete.\n"); + ui->Print("\nInstall from SD card complete.\n"); } } break; -- cgit v1.2.3