android/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 532c8600: Revert 21f0f97eba

Browse Source 
Merge commit '532c86002bb89db43094b27ec50f001ae173c650' into gingerbread-plus-aosp

* commit '532c86002bb89db43094b27ec50f001ae173c650':
  Revert 21f0f97eba
This commit is contained in:
Ying Wang 2010-09-01 14:56:27 -07:00 committed by Android Git Automerger
commit 4c7c2f73af
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
default_recovery_ui.c
View File

@ -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;
}
}

3
recovery.c
View File

@ -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;

2
ui.c
View File

@ -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;