aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2016-04-20 19:22:16 -0500
committerElliott Hughes2016-04-27 16:46:01 -0500
commitfaf36e04ed6f7e7b92a90ce7fc4ecc113eee4993 (patch)
tree3c20cad586a2db23f0a495f1165715a64cb79c28 /screen_ui.h
parentca5003e0336ebe4b8260172ed8183c5ae9095018 (diff)
downloadplatform-bootable-recovery-faf36e04ed6f7e7b92a90ce7fc4ecc113eee4993.tar.gz
platform-bootable-recovery-faf36e04ed6f7e7b92a90ce7fc4ecc113eee4993.tar.xz
platform-bootable-recovery-faf36e04ed6f7e7b92a90ce7fc4ecc113eee4993.zip
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
Diffstat (limited to 'screen_ui.h')
-rw-r--r--screen_ui.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/screen_ui.h b/screen_ui.h
index 233ff55e..d8ac85be 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -74,6 +74,11 @@ class ScreenRecoveryUI : public RecoveryUI {
74 bool intro_done; 74 bool intro_done;
75 int current_frame; 75 int current_frame;
76 76
77 // The scale factor from dp to pixels. 1.0 for mdpi, 4.0 for xxxhdpi.
78 float density_;
79 // True if we should use the large layout.
80 bool is_large_;
81
77 GRSurface* error_icon; 82 GRSurface* error_icon;
78 83
79 GRSurface* erasing_text; 84 GRSurface* erasing_text;
@@ -123,8 +128,6 @@ class ScreenRecoveryUI : public RecoveryUI {
123 // Number of frames per sec (default: 30) for both parts of the animation. 128 // Number of frames per sec (default: 30) for both parts of the animation.
124 int animation_fps; 129 int animation_fps;
125 130
126 int iconX, iconY;
127
128 int stage, max_stage; 131 int stage, max_stage;
129 132
130 int char_width_; 133 int char_width_;
@@ -133,7 +136,7 @@ class ScreenRecoveryUI : public RecoveryUI {
133 bool rtl_locale; 136 bool rtl_locale;
134 137
135 void draw_background_locked(); 138 void draw_background_locked();
136 void draw_progress_locked(); 139 void draw_foreground_locked();
137 void draw_screen_locked(); 140 void draw_screen_locked();
138 void update_screen_locked(); 141 void update_screen_locked();
139 void update_progress_locked(); 142 void update_progress_locked();
@@ -153,6 +156,11 @@ class ScreenRecoveryUI : public RecoveryUI {
153 void LoadBitmap(const char* filename, GRSurface** surface); 156 void LoadBitmap(const char* filename, GRSurface** surface);
154 void LoadLocalizedBitmap(const char* filename, GRSurface** surface); 157 void LoadLocalizedBitmap(const char* filename, GRSurface** surface);
155 158
159 int PixelsFromDp(int dp);
160 int GetAnimationBaseline();
161 int GetProgressBaseline();
162 int GetTextBaseline();
163
156 void DrawHorizontalRule(int* y); 164 void DrawHorizontalRule(int* y);
157 void DrawTextLine(int x, int* y, const char* line, bool bold); 165 void DrawTextLine(int x, int* y, const char* line, bool bold);
158 void DrawTextLines(int x, int* y, const char* const* lines); 166 void DrawTextLines(int x, int* y, const char* const* lines);