aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker2014-03-13 10:44:07 -0500
committerDoug Zongker2014-03-13 10:44:07 -0500
commitcfcec9e1d468708269edbd1e8520d1253989aefb (patch)
tree10485d489baff7a80488b5daf7381916c1fd8b0e /screen_ui.h
parentbe7eea0a880ed266bb4111dcc3a2159fdb8791d5 (diff)
parentea868b3846794cd36424f477503377ea9348137a (diff)
downloadplatform-bootable-recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.tar.gz
platform-bootable-recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.tar.xz
platform-bootable-recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.zip
Merge commit 'ea868b38' into manualmerge
Conflicts: screen_ui.cpp screen_ui.h Change-Id: Iefe7dde04cc76639f56730a19238436073f18ffb
Diffstat (limited to 'screen_ui.h')
-rw-r--r--screen_ui.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/screen_ui.h b/screen_ui.h
index 5c4366d2..aa114a4d 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -68,8 +68,7 @@ class ScreenRecoveryUI : public RecoveryUI {
68 pthread_mutex_t updateMutex; 68 pthread_mutex_t updateMutex;
69 gr_surface backgroundIcon[5]; 69 gr_surface backgroundIcon[5];
70 gr_surface backgroundText[5]; 70 gr_surface backgroundText[5];
71 gr_surface *installationOverlay; 71 gr_surface *installation;
72 gr_surface *progressBarIndeterminate;
73 gr_surface progressBarEmpty; 72 gr_surface progressBarEmpty;
74 gr_surface progressBarFill; 73 gr_surface progressBarFill;
75 gr_surface stageMarkerEmpty; 74 gr_surface stageMarkerEmpty;
@@ -101,16 +100,12 @@ class ScreenRecoveryUI : public RecoveryUI {
101 pthread_t progress_t; 100 pthread_t progress_t;
102 101
103 int animation_fps; 102 int animation_fps;
104 int indeterminate_frames;
105 int installing_frames; 103 int installing_frames;
106 protected: 104
107 int install_overlay_offset_x, install_overlay_offset_y; 105 int iconX, iconY;
108 private:
109 int overlay_offset_x, overlay_offset_y;
110 106
111 int stage, max_stage; 107 int stage, max_stage;
112 108
113 void draw_install_overlay_locked(int frame);
114 void draw_background_locked(Icon icon); 109 void draw_background_locked(Icon icon);
115 void draw_progress_locked(); 110 void draw_progress_locked();
116 void draw_screen_locked(); 111 void draw_screen_locked();
@@ -120,6 +115,7 @@ class ScreenRecoveryUI : public RecoveryUI {
120 void progress_loop(); 115 void progress_loop();
121 116
122 void LoadBitmap(const char* filename, gr_surface* surface); 117 void LoadBitmap(const char* filename, gr_surface* surface);
118 void LoadBitmapArray(const char* filename, int* frames, gr_surface** surface);
123 void LoadLocalizedBitmap(const char* filename, gr_surface* surface); 119 void LoadLocalizedBitmap(const char* filename, gr_surface* surface);
124}; 120};
125 121