summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-09-01 23:53:32 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-01 23:53:32 +0200
commit17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01 (patch)
treec05327d377d4acd0c410d5b04829fe54e0fe96dc
parentam 965f9dc4: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward (diff)
parentFix for crespo. (diff)
downloadandroid_bootable_recovery-17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01.tar
android_bootable_recovery-17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01.tar.gz
android_bootable_recovery-17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01.tar.bz2
android_bootable_recovery-17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01.tar.lz
android_bootable_recovery-17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01.tar.xz
android_bootable_recovery-17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01.tar.zst
android_bootable_recovery-17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01.zip
-rw-r--r--default_recovery_ui.c6
-rw-r--r--recovery.c3
-rw-r--r--ui.c2
3 files changed, 6 insertions, 5 deletions
diff --git a/default_recovery_ui.c b/default_recovery_ui.c
index 409d67934..a637ae0b5 100644
--- a/default_recovery_ui.c
+++ b/default_recovery_ui.c
@@ -44,15 +44,15 @@ int device_reboot_now(volatile char* key_pressed, int key_code) {
int device_handle_key(int key_code, int visible) {
if (visible) {
switch (key_code) {
- case KEY_DOWN:
+ case 0x3a:
case KEY_VOLUMEDOWN:
return HIGHLIGHT_DOWN;
- case KEY_UP:
+ case 0x2a:
case KEY_VOLUMEUP:
return HIGHLIGHT_UP;
- case KEY_ENTER:
+ case 0x9e:
return SELECT_ITEM;
}
}
diff --git a/recovery.c b/recovery.c
index 04bf657d5..5b772dcb1 100644
--- a/recovery.c
+++ b/recovery.c
@@ -51,7 +51,7 @@ static const struct option OPTIONS[] = {
static const char *COMMAND_FILE = "CACHE:recovery/command";
static const char *INTENT_FILE = "CACHE:recovery/intent";
static const char *LOG_FILE = "CACHE:recovery/log";
-static const char *SDCARD_PACKAGE_FILE = "SDCARD:update.zip";
+static const char *SDCARD_PACKAGE_FILE = "CACHE:update.zip";
static const char *TEMPORARY_LOG_FILE = "/tmp/recovery.log";
static const char *SIDELOAD_TEMP_DIR = "TMP:sideload";
@@ -577,6 +577,7 @@ main(int argc, char **argv) {
ui_init();
get_args(&argc, &argv);
+ ui_print("Rebooting started...\n");
int previous_runs = 0;
const char *send_intent = NULL;
const char *update_package = NULL;
diff --git a/ui.c b/ui.c
index 01a005f80..b8c6d1f26 100644
--- a/ui.c
+++ b/ui.c
@@ -77,7 +77,7 @@ static int gPagesIdentical = 0;
static char text[MAX_ROWS][MAX_COLS];
static int text_cols = 0, text_rows = 0;
static int text_col = 0, text_row = 0, text_top = 0;
-static int show_text = 0;
+static int show_text = 1;
static char menu[MAX_ROWS][MAX_COLS];
static int show_menu = 0;