diff options
author | Tianjie Xu <xunchang@google.com> | 2018-10-23 20:34:34 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-10-23 20:34:34 +0200 |
commit | 8bac38a0d63a78fdefbbbf7c470f1539748508da (patch) | |
tree | e68e20918057d4c1f88189edb49bcabad066535c /wear_ui.cpp | |
parent | Merge "minui: Move GRSurface into a class." (diff) | |
parent | Merge "Add function to show localized rescue party menu" (diff) | |
download | android_bootable_recovery-8bac38a0d63a78fdefbbbf7c470f1539748508da.tar android_bootable_recovery-8bac38a0d63a78fdefbbbf7c470f1539748508da.tar.gz android_bootable_recovery-8bac38a0d63a78fdefbbbf7c470f1539748508da.tar.bz2 android_bootable_recovery-8bac38a0d63a78fdefbbbf7c470f1539748508da.tar.lz android_bootable_recovery-8bac38a0d63a78fdefbbbf7c470f1539748508da.tar.xz android_bootable_recovery-8bac38a0d63a78fdefbbbf7c470f1539748508da.tar.zst android_bootable_recovery-8bac38a0d63a78fdefbbbf7c470f1539748508da.zip |
Diffstat (limited to 'wear_ui.cpp')
-rw-r--r-- | wear_ui.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp index 8f3bc7bbe..0611f94c9 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -95,13 +95,14 @@ void WearRecoveryUI::update_progress_locked() { void WearRecoveryUI::SetStage(int /* current */, int /* max */) {} -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); +std::unique_ptr<Menu> WearRecoveryUI::CreateMenu(const std::vector<std::string>& text_headers, + const std::vector<std::string>& text_items, + size_t initial_selection) const { if (text_rows_ > 0 && text_cols_ > 0) { - 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(); + return std::make_unique<TextMenu>(scrollable_menu_, text_rows_ - menu_unusable_rows_ - 1, + text_cols_ - 1, text_headers, text_items, initial_selection, + char_height_, *this); } + + return nullptr; } |