diff options
author | Sen Jiang <senj@google.com> | 2016-12-14 23:07:46 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-14 23:07:46 +0100 |
commit | ef45a88680ee00fe2283ee68dab884b150dc45ab (patch) | |
tree | 6066d58e37b89d85081c1f32ca5b406437b159fa /wear_ui.cpp | |
parent | Merge "updater: Fix the operator order." am: 2bb3a2270e (diff) | |
parent | Merge "Add a stub recovery UI." (diff) | |
download | android_bootable_recovery-ef45a88680ee00fe2283ee68dab884b150dc45ab.tar android_bootable_recovery-ef45a88680ee00fe2283ee68dab884b150dc45ab.tar.gz android_bootable_recovery-ef45a88680ee00fe2283ee68dab884b150dc45ab.tar.bz2 android_bootable_recovery-ef45a88680ee00fe2283ee68dab884b150dc45ab.tar.lz android_bootable_recovery-ef45a88680ee00fe2283ee68dab884b150dc45ab.tar.xz android_bootable_recovery-ef45a88680ee00fe2283ee68dab884b150dc45ab.tar.zst android_bootable_recovery-ef45a88680ee00fe2283ee68dab884b150dc45ab.zip |
Diffstat (limited to 'wear_ui.cpp')
-rw-r--r-- | wear_ui.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp index 0918ac457..11e5a7168 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -190,8 +190,10 @@ void WearRecoveryUI::update_progress_locked() { gr_flip(); } -void WearRecoveryUI::InitTextParams() { - ScreenRecoveryUI::InitTextParams(); +bool WearRecoveryUI::InitTextParams() { + if (!ScreenRecoveryUI::InitTextParams()) { + return false; + } text_cols_ = (gr_fb_width() - (outer_width * 2)) / char_width_; @@ -199,15 +201,19 @@ void WearRecoveryUI::InitTextParams() { if (text_cols_ > kMaxCols) text_cols_ = kMaxCols; visible_text_rows = (gr_fb_height() - (outer_height * 2)) / char_height_; + return true; } -void WearRecoveryUI::Init() { - ScreenRecoveryUI::Init(); +bool WearRecoveryUI::Init() { + if (!ScreenRecoveryUI::Init()) { + return false; + } LoadBitmap("icon_installing", &backgroundIcon[INSTALLING_UPDATE]); backgroundIcon[ERASING] = backgroundIcon[INSTALLING_UPDATE]; LoadBitmap("icon_error", &backgroundIcon[ERROR]); backgroundIcon[NO_COMMAND] = backgroundIcon[ERROR]; + return true; } void WearRecoveryUI::SetStage(int current, int max) |