am 21f0f97e: Fix for crespo.

Merge commit '21f0f97ebabb47adcbfe8d38b02685f2019b4eb3' into gingerbread-plus-aosp

* commit '21f0f97ebabb47adcbfe8d38b02685f2019b4eb3':
  Fix for crespo.

3 files changed, 6 insertions, 5 deletions

diff --git a/default_recovery_ui.c b/default_recovery_ui.c
index 409d679..a637ae0 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 04bf657..5b772dc 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 01a005f..b8c6d1f 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;