From 1a0a30a16a8071c59e265f52de60dedc54d31bd9 Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Thu, 25 Oct 2018 15:22:07 -0700 Subject: Show wipe data confirmation text in recovery mode After we generate the localized confirmation text images for certain dpi, we can now load these images and display them under recovery. Devices that cannot load the images will use the backup text strings as before. Bug: 74397117 Test: check the menu with multiple locales, and check all the images locally with locale test, check the fall back strings. Change-Id: Ic31a55670026c909ec7a05cb0bb4a0fc1d5d15c7 --- screen_ui.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'screen_ui.h') diff --git a/screen_ui.h b/screen_ui.h index ff245a2fb..acd44c819 100644 --- a/screen_ui.h +++ b/screen_ui.h @@ -240,6 +240,11 @@ class ScreenRecoveryUI : public RecoveryUI, public DrawInterface { const std::vector& backup_items, const std::function& key_handler) override; + // Displays the localized wipe data confirmation menu. + size_t ShowPromptWipeDataConfirmationMenu( + const std::vector& backup_headers, const std::vector& backup_items, + const std::function& key_handler) override; + protected: static constexpr int kMenuIndent = 4; @@ -334,9 +339,11 @@ class ScreenRecoveryUI : public RecoveryUI, public DrawInterface { std::unique_ptr no_command_text_; // Localized text images for the wipe data menu. - std::unique_ptr wipe_data_menu_header_text_; - std::unique_ptr try_again_text_; + std::unique_ptr cancel_wipe_data_text_; std::unique_ptr factory_data_reset_text_; + std::unique_ptr try_again_text_; + std::unique_ptr wipe_data_confirmation_text_; + std::unique_ptr wipe_data_menu_header_text_; // current_icon_ points to one of the frames in intro_frames_ or loop_frames_, indexed by // current_frame_, or error_icon_. -- cgit v1.2.3