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.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'wear_ui.h') 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.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'wear_ui.h') 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