diff options
author | Tao Bao <tbao@google.com> | 2017-09-01 20:28:09 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-01 20:28:09 +0200 |
commit | e6fa4f2ca73ba182c4be14e05ae2616c93fa2577 (patch) | |
tree | 6e0b0fae42120d8d170e5941f1ddea0053da5885 | |
parent | Merge "Turn on -Wall for libedify" am: deb5de0bc1 am: 365059c61b am: 36983d8dd0 (diff) | |
parent | Merge "wear_ui: Remove backgroundIcon." am: 6e426f2b76 am: 3650e7c19b (diff) | |
download | android_bootable_recovery-e6fa4f2ca73ba182c4be14e05ae2616c93fa2577.tar android_bootable_recovery-e6fa4f2ca73ba182c4be14e05ae2616c93fa2577.tar.gz android_bootable_recovery-e6fa4f2ca73ba182c4be14e05ae2616c93fa2577.tar.bz2 android_bootable_recovery-e6fa4f2ca73ba182c4be14e05ae2616c93fa2577.tar.lz android_bootable_recovery-e6fa4f2ca73ba182c4be14e05ae2616c93fa2577.tar.xz android_bootable_recovery-e6fa4f2ca73ba182c4be14e05ae2616c93fa2577.tar.zst android_bootable_recovery-e6fa4f2ca73ba182c4be14e05ae2616c93fa2577.zip |
Diffstat (limited to '')
-rw-r--r-- | wear_ui.cpp | 40 | ||||
-rw-r--r-- | wear_ui.h | 8 |
2 files changed, 8 insertions, 40 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp index 85c8f835d..b9289d366 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -50,8 +50,6 @@ WearRecoveryUI::WearRecoveryUI() loop_frames = 60; touch_screen_allowed_ = true; - - for (size_t i = 0; i < 5; i++) backgroundIcon[i] = NULL; } int WearRecoveryUI::GetProgressBaseline() const { @@ -67,24 +65,12 @@ void WearRecoveryUI::draw_background_locked() { gr_fill(0, 0, gr_fb_width(), gr_fb_height()); if (currentIcon != NONE) { - GRSurface* surface; - if (currentIcon == INSTALLING_UPDATE || currentIcon == ERASING) { - if (!intro_done) { - surface = introFrames[current_frame]; - } else { - surface = loopFrames[current_frame]; - } - } else { - surface = backgroundIcon[currentIcon]; - } - - int width = gr_get_width(surface); - int height = gr_get_height(surface); - - int x = (gr_fb_width() - width) / 2; - int y = (gr_fb_height() - height) / 2; - - gr_blit(surface, 0, 0, width, height, x, y); + GRSurface* frame = GetCurrentFrame(); + int frame_width = gr_get_width(frame); + int frame_height = gr_get_height(frame); + int frame_x = (gr_fb_width() - frame_width) / 2; + int frame_y = (gr_fb_height() - frame_height) / 2; + gr_blit(frame, 0, 0, frame_width, frame_height, frame_x, frame_y); } } @@ -177,20 +163,6 @@ void WearRecoveryUI::update_progress_locked() { gr_flip(); } -bool WearRecoveryUI::Init(const std::string& locale) { - if (!ScreenRecoveryUI::Init(locale)) { - return false; - } - - LoadBitmap("icon_error", &backgroundIcon[ERROR]); - backgroundIcon[NO_COMMAND] = backgroundIcon[ERROR]; - - // This leaves backgroundIcon[INSTALLING_UPDATE] and backgroundIcon[ERASING] - // as NULL which is fine since draw_background_locked() doesn't use them. - - return true; -} - void WearRecoveryUI::SetStage(int current, int max) { } @@ -25,8 +25,6 @@ class WearRecoveryUI : public ScreenRecoveryUI { public: WearRecoveryUI(); - bool Init(const std::string& locale) override; - void SetStage(int current, int max) override; // printing messages @@ -55,14 +53,12 @@ class WearRecoveryUI : public ScreenRecoveryUI { void PrintV(const char*, bool, va_list) override; private: - GRSurface* backgroundIcon[5]; - - int menu_start, menu_end; - void draw_background_locked() override; void draw_screen_locked() override; void PutChar(char); + + int menu_start, menu_end; }; #endif // RECOVERY_WEAR_UI_H |