aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-13 20:24:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-13 20:24:41 +0000
commit507630e99cecddca3c22425a76634c8461faf46e (patch)
treeb8e7f4549a7fb6d562a1e01eac35e1080031db0e
parentd56e0f377eab630b1fbedcf291954489fd4fa5e3 (diff)
parentb68c4fc42617acb97dde89f501caf8558a348b51 (diff)
downloadbootable_recovery-507630e99cecddca3c22425a76634c8461faf46e.zip
bootable_recovery-507630e99cecddca3c22425a76634c8461faf46e.tar.gz
bootable_recovery-507630e99cecddca3c22425a76634c8461faf46e.tar.bz2
am b68c4fc4: Merge "Treat KEY_ENTER the same as KEY_POWER in the pager."
* commit 'b68c4fc42617acb97dde89f501caf8558a348b51': Treat KEY_ENTER the same as KEY_POWER in the pager.
-rw-r--r--screen_ui.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp
index 1e42ee7..cca261f 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -539,7 +539,7 @@ void ScreenRecoveryUI::ShowFile(FILE* fp) {
while (show_prompt) {
show_prompt = false;
int key = WaitKey();
- if (key == KEY_POWER) {
+ if (key == KEY_POWER || key == KEY_ENTER) {
return;
} else if (key == KEY_UP || key == KEY_VOLUMEUP) {
if (offsets.size() <= 1) {