diff options
author | Doug Zongker <dougz@google.com> | 2014-03-11 19:39:26 -0700 |
---|---|---|
committer | Doug Zongker <dougz@google.com> | 2014-03-11 19:39:26 -0700 |
commit | c15b7865badc3ac406a7ce978baa65151a50bb55 (patch) | |
tree | 4298bb59e37a9f1ea05e89391564c3bb13f75732 /screen_ui.h | |
parent | 49968f0903eb69b1505bc99926344aacee4e81b6 (diff) | |
parent | ea868b3846794cd36424f477503377ea9348137a (diff) | |
download | bootable_recovery-c15b7865badc3ac406a7ce978baa65151a50bb55.zip bootable_recovery-c15b7865badc3ac406a7ce978baa65151a50bb55.tar.gz bootable_recovery-c15b7865badc3ac406a7ce978baa65151a50bb55.tar.bz2 |
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.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/screen_ui.h b/screen_ui.h index 5c4366d..ea7712a 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,12 +100,9 @@ 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; @@ -120,6 +116,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); }; |