scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-12 10:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

poppy: use return key for selection

Browse Source 
Replacing right arrow key with return for selection
when keyboard is available because it's more obvious.

BUG=b:35585623
BRANCH=None
TEST=reboot and make sure return selects menu item.

Change-Id: I6b2fbd8cddcd98c49638a6b9d79b47da1ca6545f
Signed-off-by: Shelley Chen <shchen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/444944
Reviewed-by: Randall Spangler <rspangler@chromium.org>
This commit is contained in:
Shelley Chen
2017-02-15 11:06:13 -08:00
committed by chrome-bot
parent 19a41188cd
commit 05f0058479
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/lib/vboot_ui_menu.c
View File

@@ -666,10 +666,6 @@ VbError_t vb2_developer_menu(struct vb2_context *ctx, VbCommonParams *cparams)
case 0: case 0:
/* Nothing pressed */ /* Nothing pressed */
break; break;
case '\r':
/* Only disable virtual dev switch if allowed by GBB */
if (!(gbb->flags & GBB_FLAG_ENTER_TRIGGERS_TONORM))
break;
case 0x04: case 0x04:
/* Ctrl+D = dismiss warning; advance to timeout */ /* Ctrl+D = dismiss warning; advance to timeout */
VB2_DEBUG("user pressed Ctrl+D; skip delay\n"); VB2_DEBUG("user pressed Ctrl+D; skip delay\n");
@@ -732,7 +728,7 @@ VbError_t vb2_developer_menu(struct vb2_context *ctx, VbCommonParams *cparams)
vb2_print_current_menu(); vb2_print_current_menu();
break; break;
case VB_BUTTON_POWER: case VB_BUTTON_POWER:
case VB_KEY_RIGHT: case '\r':
selected = 1; selected = 1;
ret = vb2_update_menu(); ret = vb2_update_menu();
@@ -979,7 +975,6 @@ VbError_t vb2_recovery_menu(struct vb2_context *ctx, VbCommonParams *cparams)
break; break;
case VB_BUTTON_VOL_UP: case VB_BUTTON_VOL_UP:
case VB_KEY_UP: case VB_KEY_UP:
VB2_DEBUG("pressed key VB_KEY_UP\n");
vb2_get_current_menu_size(current_menu, NULL, &menu_size); vb2_get_current_menu_size(current_menu, NULL, &menu_size);
if (current_menu_idx > 0) if (current_menu_idx > 0)
current_menu_idx--; current_menu_idx--;
@@ -987,15 +982,13 @@ VbError_t vb2_recovery_menu(struct vb2_context *ctx, VbCommonParams *cparams)
break; break;
case VB_BUTTON_VOL_DOWN: case VB_BUTTON_VOL_DOWN:
case VB_KEY_DOWN: case VB_KEY_DOWN:
VB2_DEBUG("pressed key VB_KEY_DOWN\n");
vb2_get_current_menu_size(current_menu, NULL, &menu_size); vb2_get_current_menu_size(current_menu, NULL, &menu_size);
if (current_menu_idx < menu_size-1) if (current_menu_idx < menu_size-1)
current_menu_idx++; current_menu_idx++;
vb2_print_current_menu(); vb2_print_current_menu();
break; break;
case VB_BUTTON_POWER: case VB_BUTTON_POWER:
case VB_KEY_RIGHT: case '\r':
VB2_DEBUG("pressed key VB_KEY_RIGHT (SELECT)\n");
selected = 1; selected = 1;
ret = vb2_update_menu(); ret = vb2_update_menu();