From 7a491225bbbb24593a4eda5dabe2fc1850d60dd1 Mon Sep 17 00:00:00 2001 From: Prashant Malani Date: Fri, 11 Mar 2016 10:00:55 -0800 Subject: recovery: Remove SetColor, and other refactoring for WearUI The only difference from SetColor in ScreenRecoveryUI is the that the LOG messages have slightly different colors. That's not enough to warrant a duplicate function. So this patch removes SetColor and uses the parent class version. This patch also moves the DrawTextLine* functions into ScreenRecoveryUI since they're mostly the same. It also moves char_width and char_height into the class instead of keeping them as static variables. Bug: 27407422 Change-Id: I30428c9433baab8410cf710a01c9b1c44c217bf1 --- wear_ui.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'wear_ui.h') diff --git a/wear_ui.h b/wear_ui.h index 92cd320bb..e2d6fe072 100644 --- a/wear_ui.h +++ b/wear_ui.h @@ -53,9 +53,6 @@ class WearRecoveryUI : public ScreenRecoveryUI { void Redraw(); - enum UIElement { HEADER, MENU, MENU_SEL_BG, MENU_SEL_FG, LOG, TEXT_FILL }; - virtual void SetColor(UIElement e); - protected: int progress_bar_height, progress_bar_width; @@ -122,8 +119,6 @@ class WearRecoveryUI : public ScreenRecoveryUI { void progress_loop(); void PutChar(char); void ClearText(); - void DrawTextLine(int x, int* y, const char* line, bool bold); - void DrawTextLines(int x, int* y, const char* const* lines); void PrintV(const char*, bool, va_list); }; -- cgit v1.2.3