aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker2014-03-11 16:18:56 -0500
committerGerrit Code Review2014-03-11 16:18:56 -0500
commitea868b3846794cd36424f477503377ea9348137a (patch)
tree979387b5cb6cb777638f71c8773fbebbca04fea0 /screen_ui.h
parent2f173bde6584f4c560ecc3f13f6e890f52815050 (diff)
parent469954fe3d7c3d729e500512ab911a037b90cc77 (diff)
downloadplatform-bootable-recovery-ea868b3846794cd36424f477503377ea9348137a.tar.gz
platform-bootable-recovery-ea868b3846794cd36424f477503377ea9348137a.tar.xz
platform-bootable-recovery-ea868b3846794cd36424f477503377ea9348137a.zip
Merge "change how recovery animation is implemented"
Diffstat (limited to 'screen_ui.h')
-rw-r--r--screen_ui.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/screen_ui.h b/screen_ui.h
index fc35d95b..ada006d1 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -69,8 +69,7 @@ class ScreenRecoveryUI : public RecoveryUI {
69 pthread_mutex_t updateMutex; 69 pthread_mutex_t updateMutex;
70 gr_surface backgroundIcon[5]; 70 gr_surface backgroundIcon[5];
71 gr_surface backgroundText[5]; 71 gr_surface backgroundText[5];
72 gr_surface *installationOverlay; 72 gr_surface *installation;
73 gr_surface *progressBarIndeterminate;
74 gr_surface progressBarEmpty; 73 gr_surface progressBarEmpty;
75 gr_surface progressBarFill; 74 gr_surface progressBarFill;
76 75
@@ -100,9 +99,9 @@ class ScreenRecoveryUI : public RecoveryUI {
100 pthread_t progress_t; 99 pthread_t progress_t;
101 100
102 int animation_fps; 101 int animation_fps;
103 int indeterminate_frames;
104 int installing_frames; 102 int installing_frames;
105 int overlay_offset_x, overlay_offset_y; 103
104 int iconX, iconY;
106 105
107 void draw_install_overlay_locked(int frame); 106 void draw_install_overlay_locked(int frame);
108 void draw_background_locked(Icon icon); 107 void draw_background_locked(Icon icon);
@@ -114,6 +113,7 @@ class ScreenRecoveryUI : public RecoveryUI {
114 void progress_loop(); 113 void progress_loop();
115 114
116 void LoadBitmap(const char* filename, gr_surface* surface); 115 void LoadBitmap(const char* filename, gr_surface* surface);
116 void LoadBitmapArray(const char* filename, int* frames, gr_surface** surface);
117 void LoadLocalizedBitmap(const char* filename, gr_surface* surface); 117 void LoadLocalizedBitmap(const char* filename, gr_surface* surface);
118}; 118};
119 119