tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wear_ui: Remove backgroundIcon.

Browse source 
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
This commit is contained in:
Tao Bao 2017-08-30 15:23:34 -07:00
parent 11f68b6b69
commit 79127102e4
2 changed files with 8 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
wear_ui.cpp
View file

@ -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) {
}

8
wear_ui.h
View file

@ -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