aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-13 20:52:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-13 20:52:09 +0000
commitdd35c9898c5e6b28aa3b66786e275b25518031e2 (patch)
treeb8e7f4549a7fb6d562a1e01eac35e1080031db0e
parentf59062b7ea93f3d7465f869b7f22fb8fa1c7ee60 (diff)
parent507630e99cecddca3c22425a76634c8461faf46e (diff)
downloadbootable_recovery-dd35c9898c5e6b28aa3b66786e275b25518031e2.zip
bootable_recovery-dd35c9898c5e6b28aa3b66786e275b25518031e2.tar.gz
bootable_recovery-dd35c9898c5e6b28aa3b66786e275b25518031e2.tar.bz2
am 507630e9: am b68c4fc4: Merge "Treat KEY_ENTER the same as KEY_POWER in the pager."
* commit '507630e99cecddca3c22425a76634c8461faf46e': 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) {