diff options
author | Tianjie Xu <xunchang@google.com> | 2018-12-12 01:19:08 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-12-12 01:19:08 +0100 |
commit | 07911574249f637df015bca00998ec0c0f7c56db (patch) | |
tree | b4c41b378f11d46e64248a4157f087bb87e82d1e /screen_ui.cpp | |
parent | [automerger skipped] Import translations. DO NOT MERGE am: 00ab5cd4f7 -s ours (diff) | |
parent | Merge "Show wipe data confirmation text in recovery mode" am: c456aab7e2 (diff) | |
download | android_bootable_recovery-07911574249f637df015bca00998ec0c0f7c56db.tar android_bootable_recovery-07911574249f637df015bca00998ec0c0f7c56db.tar.gz android_bootable_recovery-07911574249f637df015bca00998ec0c0f7c56db.tar.bz2 android_bootable_recovery-07911574249f637df015bca00998ec0c0f7c56db.tar.lz android_bootable_recovery-07911574249f637df015bca00998ec0c0f7c56db.tar.xz android_bootable_recovery-07911574249f637df015bca00998ec0c0f7c56db.tar.zst android_bootable_recovery-07911574249f637df015bca00998ec0c0f7c56db.zip |
Diffstat (limited to 'screen_ui.cpp')
-rw-r--r-- | screen_ui.cpp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp index 765d2fe60..575605452 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -844,9 +844,13 @@ bool ScreenRecoveryUI::InitTextParams() { return true; } -// TODO(xunchang) load localized text icons for the menu. (Init for screenRecoveryUI but -// not wearRecoveryUI). bool ScreenRecoveryUI::LoadWipeDataMenuText() { + // Ignores the errors since the member variables will stay as nullptr. + cancel_wipe_data_text_ = LoadLocalizedBitmap("cancel_wipe_data_text"); + factory_data_reset_text_ = LoadLocalizedBitmap("factory_data_reset_text"); + try_again_text_ = LoadLocalizedBitmap("try_again_text"); + wipe_data_confirmation_text_ = LoadLocalizedBitmap("wipe_data_confirmation_text"); + wipe_data_menu_header_text_ = LoadLocalizedBitmap("wipe_data_menu_header_text"); return true; } @@ -1250,6 +1254,20 @@ size_t ScreenRecoveryUI::ShowPromptWipeDataMenu(const std::vector<std::string>& return ShowMenu(std::move(wipe_data_menu), true, key_handler); } +size_t ScreenRecoveryUI::ShowPromptWipeDataConfirmationMenu( + const std::vector<std::string>& backup_headers, const std::vector<std::string>& backup_items, + const std::function<int(int, bool)>& key_handler) { + auto confirmation_menu = + CreateMenu(wipe_data_confirmation_text_.get(), + { cancel_wipe_data_text_.get(), factory_data_reset_text_.get() }, backup_headers, + backup_items, 0); + if (confirmation_menu == nullptr) { + return 0; + } + + return ShowMenu(std::move(confirmation_menu), true, key_handler); +} + bool ScreenRecoveryUI::IsTextVisible() { std::lock_guard<std::mutex> lg(updateMutex); int visible = show_text; |