From f7f9e50528761022989c4f0cac6a92716b54674f Mon Sep 17 00:00:00 2001 From: Prashant Malani Date: Thu, 10 Mar 2016 03:40:20 +0000 Subject: Revert "recovery: More refactoring of WearUI" This reverts commit 1c7b2230d8aac9f064f68c48b6aa26aca000cc9d. This change can lead to the derived class indirectly (and incorrectly) calling some functions from the base class, which can lead to unpredictable behavior. Bug: 27407422 Change-Id: I126a7489b0787dc195e942e2ceea6769de20d70c --- wear_ui.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'wear_ui.h') diff --git a/wear_ui.h b/wear_ui.h index 63a257244..35ea51660 100644 --- a/wear_ui.h +++ b/wear_ui.h @@ -24,6 +24,13 @@ class WearRecoveryUI : public ScreenRecoveryUI { WearRecoveryUI(); void Init(); + // overall recovery state ("background image") + void SetBackground(Icon icon); + + // progress indicator + void SetProgressType(ProgressType type); + void ShowProgress(float portion, float seconds); + void SetProgress(float fraction); void SetStage(int current, int max); @@ -42,6 +49,9 @@ class WearRecoveryUI : public ScreenRecoveryUI { void StartMenu(const char* const * headers, const char* const * items, int initial_selection); int SelectMenu(int sel); + void EndMenu(); + + void Redraw(); enum UIElement { HEADER, MENU, MENU_SEL_BG, MENU_SEL_FG, LOG, TEXT_FILL }; virtual void SetColor(UIElement e); @@ -68,6 +78,8 @@ class WearRecoveryUI : public ScreenRecoveryUI { int animation_fps; private: + Icon currentIcon; + bool intro_done; int current_frame; -- cgit v1.2.3