aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2015-04-13 16:36:02 -0500
committerElliott Hughes2015-04-13 17:46:15 -0500
commit8fd86d77f1a2f15c6fa95bc390bcbe646374873a (patch)
treefa39003f9127c243b686264b48d5d2671e2ce8ac /device.cpp
parent17b032e159779886f0151641a9aad5003debdce2 (diff)
downloadplatform-bootable-recovery-8fd86d77f1a2f15c6fa95bc390bcbe646374873a.tar.gz
platform-bootable-recovery-8fd86d77f1a2f15c6fa95bc390bcbe646374873a.tar.xz
platform-bootable-recovery-8fd86d77f1a2f15c6fa95bc390bcbe646374873a.zip
Move the menu header out of the menu.
This makes it easier for us to deal with arbitrary information at the top, and means that headers added by specific commands don't overwrite the default ones. Add the fingerprint back, but broken up so it fits even on sprout's display. Change-Id: Id71da79ab1aa455a611d72756a3100a97ceb4c1c
Diffstat (limited to 'device.cpp')
-rw-r--r--device.cpp18
1 files changed, 0 insertions, 18 deletions
diff --git a/device.cpp b/device.cpp
index 024fc346..fd1a9875 100644
--- a/device.cpp
+++ b/device.cpp
@@ -16,20 +16,6 @@
16 16
17#include "device.h" 17#include "device.h"
18 18
19static const char* REGULAR_HEADERS[] = {
20 "Volume up/down move highlight.",
21 "Power button activates.",
22 "",
23 NULL
24};
25
26static const char* LONG_PRESS_HEADERS[] = {
27 "Any button cycles highlight.",
28 "Long-press activates.",
29 "",
30 NULL
31};
32
33static const char* MENU_ITEMS[] = { 19static const char* MENU_ITEMS[] = {
34 "Reboot system now", 20 "Reboot system now",
35 "Reboot to bootloader", 21 "Reboot to bootloader",
@@ -43,10 +29,6 @@ static const char* MENU_ITEMS[] = {
43 NULL 29 NULL
44}; 30};
45 31
46const char* const* Device::GetMenuHeaders() {
47 return ui_->HasThreeButtons() ? REGULAR_HEADERS : LONG_PRESS_HEADERS;
48}
49
50const char* const* Device::GetMenuItems() { 32const char* const* Device::GetMenuItems() {
51 return MENU_ITEMS; 33 return MENU_ITEMS;
52} 34}