summaryrefslogtreecommitdiffstats
path: root/screen_ui.h
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-15 20:36:32 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-15 20:36:32 +0200
commit0a557b6bc2a26afd3cb3a2e3dd2fdaf175b09cce (patch)
tree625c21a7688ed613dd22fc9fc9e6c68cec7c44bc /screen_ui.h
parentam 6e435abf: Merge "Move the menu header out of the menu." (diff)
parentMerge "Don't use typedefs that hide *s." (diff)
downloadandroid_bootable_recovery-0a557b6bc2a26afd3cb3a2e3dd2fdaf175b09cce.tar
android_bootable_recovery-0a557b6bc2a26afd3cb3a2e3dd2fdaf175b09cce.tar.gz
android_bootable_recovery-0a557b6bc2a26afd3cb3a2e3dd2fdaf175b09cce.tar.bz2
android_bootable_recovery-0a557b6bc2a26afd3cb3a2e3dd2fdaf175b09cce.tar.lz
android_bootable_recovery-0a557b6bc2a26afd3cb3a2e3dd2fdaf175b09cce.tar.xz
android_bootable_recovery-0a557b6bc2a26afd3cb3a2e3dd2fdaf175b09cce.tar.zst
android_bootable_recovery-0a557b6bc2a26afd3cb3a2e3dd2fdaf175b09cce.zip
Diffstat (limited to 'screen_ui.h')
-rw-r--r--screen_ui.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/screen_ui.h b/screen_ui.h
index d473b8e94..46165d90c 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -73,13 +73,13 @@ class ScreenRecoveryUI : public RecoveryUI {
bool rtl_locale;
pthread_mutex_t updateMutex;
- gr_surface backgroundIcon[5];
- gr_surface backgroundText[5];
- gr_surface *installation;
- gr_surface progressBarEmpty;
- gr_surface progressBarFill;
- gr_surface stageMarkerEmpty;
- gr_surface stageMarkerFill;
+ GRSurface* backgroundIcon[5];
+ GRSurface* backgroundText[5];
+ GRSurface** installation;
+ GRSurface* progressBarEmpty;
+ GRSurface* progressBarFill;
+ GRSurface* stageMarkerEmpty;
+ GRSurface* stageMarkerFill;
ProgressType progressBarType;
@@ -127,9 +127,9 @@ class ScreenRecoveryUI : public RecoveryUI {
void DrawTextLine(int* y, const char* line, bool bold);
void DrawTextLines(int* y, const char* const* lines);
- 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);
+ void LoadBitmap(const char* filename, GRSurface** surface);
+ void LoadBitmapArray(const char* filename, int* frames, GRSurface*** surface);
+ void LoadLocalizedBitmap(const char* filename, GRSurface** surface);
};
#endif // RECOVERY_UI_H