detachables: Define options menu

This menu will be used by any of the legacy screens.
The idea is that when the user hits volume up/down, then
they will enter this options menu, which will allow the user
to change languages or show debug info.

BUG=b:67371896, b:64400036
BRANCH=None
TEST=None

Change-Id: I31d3e312388b56613368276ec72e5c68ded2264e
Signed-off-by: Shelley Chen <shchen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/770257
Commit-Ready: Benjamin Gordon <bmgordon@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
This commit is contained in:
Shelley Chen
2017-11-14 10:37:17 -08:00
committed by chrome-bot
parent b00bf851cd
commit 5f9b770d7a
3 changed files with 23 additions and 0 deletions

View File

@@ -765,6 +765,8 @@ enum VbScreenType_t {
VB_SCREEN_DEVELOPER_TO_NORM_MENU = 0x20e,
/* Detachable Menu - Languages */
VB_SCREEN_LANGUAGES_MENU = 0x20f,
/* Detachable Menu - Options */
VB_SCREEN_OPTIONS_MENU = 0x210,
};
/**

View File

@@ -15,6 +15,7 @@ typedef enum _VB_MENU {
VB_MENU_RECOVERY,
VB_MENU_TO_DEV,
VB_MENU_LANGUAGES,
VB_MENU_OPTIONS,
VB_MENU_RECOVERY_INSERT,
VB_MENU_RECOVERY_NO_GOOD,
VB_MENU_RECOVERY_BROKEN,
@@ -74,6 +75,14 @@ typedef enum _VB_LANGUAGES_MENU {
VB_LANGUAGES_COUNT,
} VB_LANGUAGES_MENU;
typedef enum _VB_OPTIONS_MENU {
VB_OPTIONS_CANCEL,
VB_OPTIONS_DBG_INFO,
VB_OPTIONS_POWER_OFF,
VB_OPTIONS_LANGUAGE,
VB_OPTIONS_COUNT,
} VB_OPTIONS_MENU;
extern VB_MENU current_menu;
extern VB_MENU prev_menu;
extern int current_menu_idx;

View File

@@ -146,6 +146,13 @@ static char *languages_menu[] = {
"US English\n",
};
static char *options_menu[] = {
"Cancel\n",
"Show Debug Info\n",
"Power Off\n",
"Language\n"
};
/**
* Get the string array and size of current_menu.
*
@@ -185,6 +192,10 @@ void vb2_get_current_menu_size(VB_MENU menu, char ***menu_array,
*size = VB_LANGUAGES_COUNT;
temp_menu = languages_menu;
break;
case VB_MENU_OPTIONS:
*size = VB_OPTIONS_COUNT;
temp_menu = options_menu;
break;
default:
*size = 0;
}
@@ -238,6 +249,7 @@ static const uint32_t VB_MENU_TO_SCREEN_MAP[] = {
VB_SCREEN_RECOVERY_MENU,
VB_SCREEN_RECOVERY_TO_DEV_MENU,
VB_SCREEN_LANGUAGES_MENU,
VB_SCREEN_OPTIONS_MENU,
VB_SCREEN_RECOVERY_INSERT,
VB_SCREEN_RECOVERY_NO_GOOD,
VB_SCREEN_OS_BROKEN,