summaryrefslogtreecommitdiffstats
path: root/wear_ui.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2018-10-12 01:54:50 +0200
committerTianjie Xu <xunchang@google.com>2018-10-13 02:18:50 +0200
commit66dbf63080dad0bd2db70b47eca124d7df53e32d (patch)
tree4aa9c18be3f39ca3571a683ab1a05bc1eed0e75b /wear_ui.cpp
parentMerge "Add function to load the key from x509.pem file" (diff)
downloadandroid_bootable_recovery-66dbf63080dad0bd2db70b47eca124d7df53e32d.tar
android_bootable_recovery-66dbf63080dad0bd2db70b47eca124d7df53e32d.tar.gz
android_bootable_recovery-66dbf63080dad0bd2db70b47eca124d7df53e32d.tar.bz2
android_bootable_recovery-66dbf63080dad0bd2db70b47eca124d7df53e32d.tar.lz
android_bootable_recovery-66dbf63080dad0bd2db70b47eca124d7df53e32d.tar.xz
android_bootable_recovery-66dbf63080dad0bd2db70b47eca124d7df53e32d.tar.zst
android_bootable_recovery-66dbf63080dad0bd2db70b47eca124d7df53e32d.zip
Diffstat (limited to '')
-rw-r--r--wear_ui.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 3b057b761..8f3bc7bbe 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -73,7 +73,7 @@ void WearRecoveryUI::draw_screen_locked() {
if (!show_text) {
draw_foreground_locked();
} else {
- SetColor(TEXT_FILL);
+ SetColor(UIElement::TEXT_FILL);
gr_fill(0, 0, gr_fb_width(), gr_fb_height());
// clang-format off
@@ -99,8 +99,9 @@ void WearRecoveryUI::StartMenu(const std::vector<std::string>& headers,
const std::vector<std::string>& items, size_t initial_selection) {
std::lock_guard<std::mutex> lg(updateMutex);
if (text_rows_ > 0 && text_cols_ > 0) {
- menu_ = std::make_unique<Menu>(scrollable_menu_, text_rows_ - menu_unusable_rows_ - 1,
- text_cols_ - 1, headers, items, initial_selection);
+ menu_ = std::make_unique<TextMenu>(scrollable_menu_, text_rows_ - menu_unusable_rows_ - 1,
+ text_cols_ - 1, headers, items, initial_selection,
+ char_height_, *this);
update_screen_locked();
}
}