diff options
author | Doug Zongker <dougz@android.com> | 2009-07-23 19:16:07 +0200 |
---|---|---|
committer | Doug Zongker <dougz@android.com> | 2009-07-23 19:36:43 +0200 |
commit | 23412e6f143c099e6c2470ad6bf98a2783eb0452 (patch) | |
tree | 5418f1983c509a37f15e969d6ec1cbced8eae278 | |
parent | resolved conflicts for merge of 64893ccc to master (diff) | |
download | android_bootable_recovery-23412e6f143c099e6c2470ad6bf98a2783eb0452.tar android_bootable_recovery-23412e6f143c099e6c2470ad6bf98a2783eb0452.tar.gz android_bootable_recovery-23412e6f143c099e6c2470ad6bf98a2783eb0452.tar.bz2 android_bootable_recovery-23412e6f143c099e6c2470ad6bf98a2783eb0452.tar.lz android_bootable_recovery-23412e6f143c099e6c2470ad6bf98a2783eb0452.tar.xz android_bootable_recovery-23412e6f143c099e6c2470ad6bf98a2783eb0452.tar.zst android_bootable_recovery-23412e6f143c099e6c2470ad6bf98a2783eb0452.zip |
Diffstat (limited to '')
-rw-r--r-- | default_recovery_ui.c | 4 | ||||
-rw-r--r-- | recovery_ui.h | 4 | ||||
-rw-r--r-- | res/images/icon_error.png | bin | 9616 -> 15259 bytes | |||
-rw-r--r-- | res/images/icon_firmware_install.png | bin | 11986 -> 17871 bytes | |||
-rw-r--r-- | res/images/icon_installing.png | bin | 10138 -> 15871 bytes | |||
-rw-r--r-- | ui.c | 1 |
6 files changed, 5 insertions, 4 deletions
diff --git a/default_recovery_ui.c b/default_recovery_ui.c index a2e4beafe..d4e620403 100644 --- a/default_recovery_ui.c +++ b/default_recovery_ui.c @@ -29,11 +29,11 @@ char* MENU_ITEMS[] = { "reboot system now", "wipe cache partition", NULL }; -int device_toggle_display(char* key_pressed, int key_code) { +int device_toggle_display(volatile char* key_pressed, int key_code) { return key_code == KEY_HOME; } -int device_reboot_now(char* key_pressed, int key_code) { +int device_reboot_now(volatile char* key_pressed, int key_code) { return 0; } diff --git a/recovery_ui.h b/recovery_ui.h index 671fe40ce..8818ef303 100644 --- a/recovery_ui.h +++ b/recovery_ui.h @@ -21,13 +21,13 @@ // *key_pressed is an array of KEY_MAX+1 bytes indicating which other // keys are already pressed. Return true if the text display should // be toggled. -extern int device_toggle_display(char* key_pressed, int key_code); +extern int device_toggle_display(volatile char* key_pressed, int key_code); // Called in the input thread when a new key (key_code) is pressed. // *key_pressed is an array of KEY_MAX+1 bytes indicating which other // keys are already pressed. Return true if the device should reboot // immediately. -extern int device_reboot_now(char* key_pressed, int key_code); +extern int device_reboot_now(volatile char* key_pressed, int key_code); // Called from the main thread when recovery is waiting for input and // a key is pressed. key is the code of the key pressed; visible is diff --git a/res/images/icon_error.png b/res/images/icon_error.png Binary files differindex 7064c2e23..6cb71c0b3 100644 --- a/res/images/icon_error.png +++ b/res/images/icon_error.png diff --git a/res/images/icon_firmware_install.png b/res/images/icon_firmware_install.png Binary files differindex ee2afac5d..8bfe77589 100644 --- a/res/images/icon_firmware_install.png +++ b/res/images/icon_firmware_install.png diff --git a/res/images/icon_installing.png b/res/images/icon_installing.png Binary files differindex f24f2e33f..1aeb9d959 100644 --- a/res/images/icon_installing.png +++ b/res/images/icon_installing.png @@ -27,6 +27,7 @@ #include "common.h" #include "minui/minui.h" +#include "recovery_ui.h" #define MAX_COLS 64 #define MAX_ROWS 32 |