From 532c86002bb89db43094b27ec50f001ae173c650 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Wed, 1 Sep 2010 14:52:22 -0700
Subject: Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3

Change-Id: I46e4d7fe76e4219207e46f19e50188e38bb932b7
---
 default_recovery_ui.c | 6 +++---
 recovery.c            | 3 +--
 ui.c                  | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/default_recovery_ui.c b/default_recovery_ui.c
index a637ae0b5..409d67934 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 0x3a:
+            case KEY_DOWN:
             case KEY_VOLUMEDOWN:
                 return HIGHLIGHT_DOWN;
 
-            case 0x2a:
+            case KEY_UP:
             case KEY_VOLUMEUP:
                 return HIGHLIGHT_UP;
 
-            case 0x9e:
+            case KEY_ENTER:
                 return SELECT_ITEM;
         }
     }
diff --git a/recovery.c b/recovery.c
index 5b772dcb1..04bf657d5 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 = "CACHE:update.zip";
+static const char *SDCARD_PACKAGE_FILE = "SDCARD:update.zip";
 static const char *TEMPORARY_LOG_FILE = "/tmp/recovery.log";
 static const char *SIDELOAD_TEMP_DIR = "TMP:sideload";
 
@@ -577,7 +577,6 @@ 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 b8c6d1f26..01a005f80 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 = 1;
+static int show_text = 0;
 
 static char menu[MAX_ROWS][MAX_COLS];
 static int show_menu = 0;
-- 
cgit v1.2.3