summaryrefslogtreecommitdiffstats
path: root/screen_ui.h
diff options
context:
space:
mode:
authorDoug Zongker <dougz@google.com>2014-03-13 16:44:07 +0100
committerDoug Zongker <dougz@google.com>2014-03-13 16:44:07 +0100
commitcfcec9e1d468708269edbd1e8520d1253989aefb (patch)
tree10485d489baff7a80488b5daf7381916c1fd8b0e /screen_ui.h
parentam 2f173bde: Merge "ADB sideload command not work" (diff)
parentMerge "change how recovery animation is implemented" (diff)
downloadandroid_bootable_recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.tar
android_bootable_recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.tar.gz
android_bootable_recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.tar.bz2
android_bootable_recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.tar.lz
android_bootable_recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.tar.xz
android_bootable_recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.tar.zst
android_bootable_recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.zip
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 5c4366d28..aa114a4d9 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -68,8 +68,7 @@ class ScreenRecoveryUI : public RecoveryUI {
pthread_mutex_t updateMutex;
gr_surface backgroundIcon[5];
gr_surface backgroundText[5];
- gr_surface *installationOverlay;
- gr_surface *progressBarIndeterminate;
+ gr_surface *installation;
gr_surface progressBarEmpty;
gr_surface progressBarFill;
gr_surface stageMarkerEmpty;
@@ -101,16 +100,12 @@ class ScreenRecoveryUI : public RecoveryUI {
pthread_t progress_t;
int animation_fps;
- int indeterminate_frames;
int installing_frames;
- protected:
- int install_overlay_offset_x, install_overlay_offset_y;
- private:
- int overlay_offset_x, overlay_offset_y;
+
+ int iconX, iconY;
int stage, max_stage;
- void draw_install_overlay_locked(int frame);
void draw_background_locked(Icon icon);
void draw_progress_locked();
void draw_screen_locked();
@@ -120,6 +115,7 @@ class ScreenRecoveryUI : public RecoveryUI {
void progress_loop();
void LoadBitmap(const char* filename, gr_surface* surface);
+ void LoadBitmapArray(const char* filename, int* frames, gr_surface** surface);
void LoadLocalizedBitmap(const char* filename, gr_surface* surface);
};