diff options
author | Tianjie Xu <xunchang@google.com> | 2016-05-02 20:27:32 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-02 20:27:32 +0200 |
commit | d25351da83432249780050e4766f1750f31f5577 (patch) | |
tree | af8500a155ab76d5d7ad3afa47035304beac159e /screen_ui.cpp | |
parent | Merge "recovery: Always log the update attempt. am: 5687001895 am: f13662a349" into nyc-mr1-dev-plus-aosp (diff) | |
parent | resolve merge conflicts of 23c7af7 to nyc-mr1-dev-plus-aosp (diff) | |
download | android_bootable_recovery-d25351da83432249780050e4766f1750f31f5577.tar android_bootable_recovery-d25351da83432249780050e4766f1750f31f5577.tar.gz android_bootable_recovery-d25351da83432249780050e4766f1750f31f5577.tar.bz2 android_bootable_recovery-d25351da83432249780050e4766f1750f31f5577.tar.lz android_bootable_recovery-d25351da83432249780050e4766f1750f31f5577.tar.xz android_bootable_recovery-d25351da83432249780050e4766f1750f31f5577.tar.zst android_bootable_recovery-d25351da83432249780050e4766f1750f31f5577.zip |
Diffstat (limited to 'screen_ui.cpp')
-rw-r--r-- | screen_ui.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp index cd3671f55..369755438 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -425,6 +425,16 @@ static char** Alloc2d(size_t rows, size_t cols) { return result; } +// Choose the right background string to display during update. +void ScreenRecoveryUI::SetSystemUpdateText(bool security_update) { + if (security_update) { + LoadLocalizedBitmap("installing_security_text", &installing_text); + } else { + LoadLocalizedBitmap("installing_text", &installing_text); + } + Redraw(); +} + void ScreenRecoveryUI::Init() { gr_init(); @@ -450,7 +460,10 @@ void ScreenRecoveryUI::Init() { LoadBitmap("stage_empty", &stageMarkerEmpty); LoadBitmap("stage_fill", &stageMarkerFill); - LoadLocalizedBitmap("installing_text", &installing_text); + // Background text for "installing_update" could be "installing update" + // or "installing security update". It will be set after UI init according + // to commands in BCB. + installing_text = nullptr; LoadLocalizedBitmap("erasing_text", &erasing_text); LoadLocalizedBitmap("no_command_text", &no_command_text); LoadLocalizedBitmap("error_text", &error_text); |