Update recovery UI.
* Use new animation.
* Use new non-holo progress bars.
* Use recommended spacing for recovery UI.
Bug: http://b/26548285
Change-Id: I8411e89d6a6a9ce638b8645e19e5082d0d968cee
diff --git a/screen_ui.h b/screen_ui.h
index 233ff55..d8ac85b 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -74,6 +74,11 @@
bool intro_done;
int current_frame;
+ // The scale factor from dp to pixels. 1.0 for mdpi, 4.0 for xxxhdpi.
+ float density_;
+ // True if we should use the large layout.
+ bool is_large_;
+
GRSurface* error_icon;
GRSurface* erasing_text;
@@ -123,8 +128,6 @@
// Number of frames per sec (default: 30) for both parts of the animation.
int animation_fps;
- int iconX, iconY;
-
int stage, max_stage;
int char_width_;
@@ -133,7 +136,7 @@
bool rtl_locale;
void draw_background_locked();
- void draw_progress_locked();
+ void draw_foreground_locked();
void draw_screen_locked();
void update_screen_locked();
void update_progress_locked();
@@ -153,6 +156,11 @@
void LoadBitmap(const char* filename, GRSurface** surface);
void LoadLocalizedBitmap(const char* filename, GRSurface** surface);
+ int PixelsFromDp(int dp);
+ int GetAnimationBaseline();
+ int GetProgressBaseline();
+ int GetTextBaseline();
+
void DrawHorizontalRule(int* y);
void DrawTextLine(int x, int* y, const char* line, bool bold);
void DrawTextLines(int x, int* y, const char* const* lines);