From 79127102e40fde2669db7136f40f77ab6727c386 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 30 Aug 2017 15:23:34 -0700 Subject: wear_ui: Remove backgroundIcon. It's covered by the equivalent variable in ScreenRecoveryUI: GRSurface* error_icon; Also refactor WearRecoveryUI::draw_background_locked() to get it closer to ScreenRecoveryUI code. Test: Build a wearable target recovery; Run graphics test. Change-Id: I3a8d0e4dbf6fe170e4f3adde7eaf4a2043132a57 --- wear_ui.cpp | 40 ++++++---------------------------------- 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) { } diff --git a/wear_ui.h b/wear_ui.h index 9731f4161..e97598bb1 100644 --- a/wear_ui.h +++ b/wear_ui.h @@ -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 -- cgit v1.2.3 From ee8a96a581f60acfb92d507c9394bb6914606ee4 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Fri, 1 Sep 2017 11:37:50 -0700 Subject: wear_ui: Remove PrintOnScreenOnly() and PrintV(). They're just copy/pastes from the base class (ScreenRecoveryUI). Test: mmma bootable/recovery Change-Id: I341416107a14d89d3366bba757da0b1abb988b15 --- wear_ui.cpp | 34 +--------------------------------- wear_ui.h | 3 --- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/wear_ui.cpp b/wear_ui.cpp index b9289d366..670050a0b 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -32,8 +32,8 @@ #include #include -#include #include +#include #include #include "common.h" @@ -312,35 +312,3 @@ void WearRecoveryUI::ShowFile(const char* filename) { ShowFile(fp); fclose(fp); } - -void WearRecoveryUI::PrintOnScreenOnly(const char *fmt, ...) { - va_list ap; - va_start(ap, fmt); - PrintV(fmt, false, ap); - va_end(ap); -} - -void WearRecoveryUI::PrintV(const char* fmt, bool copy_to_stdout, va_list ap) { - std::string str; - android::base::StringAppendV(&str, fmt, ap); - - if (copy_to_stdout) { - fputs(str.c_str(), stdout); - } - - pthread_mutex_lock(&updateMutex); - if (text_rows_ > 0 && text_cols_ > 0) { - for (const char* ptr = str.c_str(); *ptr != '\0'; ++ptr) { - if (*ptr == '\n' || text_col_ >= text_cols_) { - text_[text_row_][text_col_] = '\0'; - text_col_ = 0; - text_row_ = (text_row_ + 1) % text_rows_; - if (text_row_ == text_top_) text_top_ = (text_top_ + 1) % text_rows_; - } - if (*ptr != '\n') text_[text_row_][text_col_++] = *ptr; - } - text_[text_row_][text_col_] = '\0'; - update_screen_locked(); - } - pthread_mutex_unlock(&updateMutex); -} diff --git a/wear_ui.h b/wear_ui.h index e97598bb1..92ef813f3 100644 --- a/wear_ui.h +++ b/wear_ui.h @@ -29,7 +29,6 @@ class WearRecoveryUI : public ScreenRecoveryUI { // printing messages void Print(const char* fmt, ...) override; - void PrintOnScreenOnly(const char* fmt, ...) override __printflike(2, 3); void ShowFile(const char* filename) override; void ShowFile(FILE* fp) override; @@ -50,8 +49,6 @@ class WearRecoveryUI : public ScreenRecoveryUI { void update_progress_locked() override; - void PrintV(const char*, bool, va_list) override; - private: void draw_background_locked() override; void draw_screen_locked() override; -- cgit v1.2.3