aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker2014-03-11 21:39:26 -0500
committerDoug Zongker2014-03-11 21:39:26 -0500
commitc15b7865badc3ac406a7ce978baa65151a50bb55 (patch)
tree4298bb59e37a9f1ea05e89391564c3bb13f75732 /screen_ui.h
parent49968f0903eb69b1505bc99926344aacee4e81b6 (diff)
parentea868b3846794cd36424f477503377ea9348137a (diff)
downloadplatform-bootable-recovery-c15b7865badc3ac406a7ce978baa65151a50bb55.tar.gz
platform-bootable-recovery-c15b7865badc3ac406a7ce978baa65151a50bb55.tar.xz
platform-bootable-recovery-c15b7865badc3ac406a7ce978baa65151a50bb55.zip
resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aosp
Change-Id: I8cc3b8101bccf7fd697f9a7b73732d1000dc27a1
Diffstat (limited to 'screen_ui.h')
-rw-r--r--screen_ui.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/screen_ui.h b/screen_ui.h
index 5c4366d2..ea7712a3 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,12 +100,9 @@ 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
@@ -120,6 +116,7 @@ class ScreenRecoveryUI : public RecoveryUI {
120 void progress_loop(); 116 void progress_loop();
121 117
122 void LoadBitmap(const char* filename, gr_surface* surface); 118 void LoadBitmap(const char* filename, gr_surface* surface);
119 void LoadBitmapArray(const char* filename, int* frames, gr_surface** surface);
123 void LoadLocalizedBitmap(const char* filename, gr_surface* surface); 120 void LoadLocalizedBitmap(const char* filename, gr_surface* surface);
124}; 121};
125 122