diff options
author | Elliott Hughes <enh@google.com> | 2015-04-10 22:32:34 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-10 22:32:34 +0200 |
commit | 9b0ebf992e01960db42ab7debf02bb25b372c734 (patch) | |
tree | 7e8d33676678e2240d5368fca8465712b24285cd /ui.cpp | |
parent | am 6b0dd1d7: Merge "Move "Mount /system" to the main menu." (diff) | |
parent | Merge "Fix ScreenRecoveryUI to handle devices without power/up/down." (diff) | |
download | android_bootable_recovery-9b0ebf992e01960db42ab7debf02bb25b372c734.tar android_bootable_recovery-9b0ebf992e01960db42ab7debf02bb25b372c734.tar.gz android_bootable_recovery-9b0ebf992e01960db42ab7debf02bb25b372c734.tar.bz2 android_bootable_recovery-9b0ebf992e01960db42ab7debf02bb25b372c734.tar.lz android_bootable_recovery-9b0ebf992e01960db42ab7debf02bb25b372c734.tar.xz android_bootable_recovery-9b0ebf992e01960db42ab7debf02bb25b372c734.tar.zst android_bootable_recovery-9b0ebf992e01960db42ab7debf02bb25b372c734.zip |
Diffstat (limited to 'ui.cpp')
-rw-r--r-- | ui.cpp | 79 |
1 files changed, 55 insertions, 24 deletions
@@ -51,26 +51,40 @@ RecoveryUI::RecoveryUI() key_down_count(0), enable_reboot(true), consecutive_power_keys(0), - last_key(-1) { + last_key(-1), + has_power_key(false), + has_up_key(false), + has_down_key(false) { pthread_mutex_init(&key_queue_mutex, NULL); pthread_cond_init(&key_queue_cond, NULL); self = this; memset(key_pressed, 0, sizeof(key_pressed)); } +void RecoveryUI::OnKeyDetected(int key_code) { + if (key_code == KEY_POWER) { + has_power_key = true; + } else if (key_code == KEY_DOWN || key_code == KEY_VOLUMEDOWN) { + has_down_key = true; + } else if (key_code == KEY_UP || key_code == KEY_VOLUMEUP) { + has_up_key = true; + } +} + void RecoveryUI::Init() { ev_init(input_callback, NULL); + + using namespace std::placeholders; + ev_iterate_available_keys(std::bind(&RecoveryUI::OnKeyDetected, this, _1)); + pthread_create(&input_t, NULL, input_thread, NULL); } - int RecoveryUI::input_callback(int fd, uint32_t epevents, void* data) { struct input_event ev; - int ret; - - ret = ev_get_input(fd, epevents, &ev); - if (ret) + if (ev_get_input(fd, epevents, &ev) == -1) { return -1; + } if (ev.type == EV_SYN) { return 0; @@ -95,8 +109,9 @@ int RecoveryUI::input_callback(int fd, uint32_t epevents, void* data) { self->rel_sum = 0; } - if (ev.type == EV_KEY && ev.code <= KEY_MAX) + if (ev.type == EV_KEY && ev.code <= KEY_MAX) { self->process_key(ev.code, ev.value); + } return 0; } @@ -142,8 +157,7 @@ void RecoveryUI::process_key(int key_code, int updown) { pthread_mutex_unlock(&key_queue_mutex); if (register_key) { - NextCheckKeyIsLong(long_press); - switch (CheckKey(key_code)) { + switch (CheckKey(key_code, long_press)) { case RecoveryUI::IGNORE: break; @@ -257,23 +271,44 @@ bool RecoveryUI::IsKeyPressed(int key) { return pressed; } +bool RecoveryUI::IsLongPress() { + pthread_mutex_lock(&key_queue_mutex); + bool result = key_long_press; + pthread_mutex_unlock(&key_queue_mutex); + return result; +} + void RecoveryUI::FlushKeys() { pthread_mutex_lock(&key_queue_mutex); key_queue_len = 0; pthread_mutex_unlock(&key_queue_mutex); } -// The default CheckKey implementation assumes the device has power, -// volume up, and volume down keys. -// -// - Hold power and press vol-up to toggle display. -// - Press power seven times in a row to reboot. -// - Alternate vol-up and vol-down seven times to mount /system. -RecoveryUI::KeyAction RecoveryUI::CheckKey(int key) { - if ((IsKeyPressed(KEY_POWER) && key == KEY_VOLUMEUP) || key == KEY_HOME) { - return TOGGLE; +RecoveryUI::KeyAction RecoveryUI::CheckKey(int key, bool is_long_press) { + pthread_mutex_lock(&key_queue_mutex); + key_long_press = false; + pthread_mutex_unlock(&key_queue_mutex); + + // If we have power and volume up keys, that chord is the signal to toggle the text display. + if (has_power_key && has_up_key) { + if (key == KEY_VOLUMEUP && IsKeyPressed(KEY_POWER)) { + return TOGGLE; + } + } else { + // Otherwise long press of any button toggles to the text display, + // and there's no way to toggle back (but that's pretty useless anyway). + if (is_long_press && !IsTextVisible()) { + return TOGGLE; + } + + // Also, for button-limited devices, a long press is translated to KEY_ENTER. + if (is_long_press && IsTextVisible()) { + EnqueueKey(KEY_ENTER); + return IGNORE; + } } + // Press power seven times in a row to reboot. if (key == KEY_POWER) { pthread_mutex_lock(&key_queue_mutex); bool reboot_enabled = enable_reboot; @@ -290,14 +325,10 @@ RecoveryUI::KeyAction RecoveryUI::CheckKey(int key) { } last_key = key; - - return ENQUEUE; -} - -void RecoveryUI::NextCheckKeyIsLong(bool is_long_press) { + return IsTextVisible() ? ENQUEUE : IGNORE; } -void RecoveryUI::KeyLongPress(int key) { +void RecoveryUI::KeyLongPress(int) { } void RecoveryUI::SetEnableReboot(bool enabled) { |