diff options
| -rw-r--r-- | recovery/recovery_keys.c | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/recovery/recovery_keys.c b/recovery/recovery_keys.c index 528a796..f9a1072 100644 --- a/recovery/recovery_keys.c +++ b/recovery/recovery_keys.c @@ -4,19 +4,6 @@ #include "common.h" #include "extendedcommands.h" - -int device_toggle_display(volatile char* key_pressed, int key_code) { - int alt = key_pressed[KEY_LEFTALT] || key_pressed[KEY_RIGHTALT]; - if (alt && key_code == KEY_L) - return 1; - // allow toggling of the display if the correct key is pressed, and the display toggle is allowed or the display is currently off - if (ui_get_showing_back_button()) { - return 0; - //return get_allow_toggle_display() && (key_code == KEY_HOME || key_code == KEY_MENU || key_code == KEY_END); - } - return get_allow_toggle_display() && (key_code == KEY_HOMEPAGE || key_code == KEY_MENU || key_code == KEY_POWER || key_code == KEY_END); -} - int device_handle_key(int key_code, int visible) { if (visible) { switch (key_code) { @@ -24,37 +11,32 @@ int device_handle_key(int key_code, int visible) { case KEY_DOWN: case KEY_VOLUMEDOWN: return HIGHLIGHT_DOWN; + case KEY_MENU: return NO_ACTION; + case KEY_LEFTSHIFT: case KEY_UP: case KEY_VOLUMEUP: return HIGHLIGHT_UP; + case KEY_HOMEPAGE: - if (ui_get_showing_back_button()) { - return SELECT_ITEM; - } - if (!get_allow_toggle_display()) - return GO_BACK; - break; case KEY_POWER: - if (ui_get_showing_back_button()) { - return SELECT_ITEM; - } - if (!get_allow_toggle_display()) - return GO_BACK; - break; case KEY_LEFTBRACE: case KEY_ENTER: case BTN_MOUSE: case KEY_CAMERA: case KEY_F21: - case KEY_SEND: + case KEY_SEND: + return SELECT_ITEM; + case KEY_END: case KEY_BACKSPACE: case KEY_SEARCH: case KEY_BACK: - return GO_BACK; + if (!ui_root_menu) { + return GO_BACK; + } } } |