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
diff --git a/wear_ui.h b/wear_ui.h
index 63a2572..35ea516 100644
--- a/wear_ui.h
+++ b/wear_ui.h
@@ -24,6 +24,13 @@
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 @@
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 @@
int animation_fps;
private:
+ Icon currentIcon;
+
bool intro_done;
int current_frame;