diff options
author | Prashant Malani <pmalani@google.com> | 2016-03-11 19:31:00 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-03-11 19:31:00 +0100 |
commit | 749054e1e34272fc7ed987bfc2f4e24e8b9565ac (patch) | |
tree | 44356694d9dcd71287e497ee98ec987809800a29 /screen_ui.h | |
parent | Merge "Reboot and retry on I/O errors" into nyc-dev (diff) | |
parent | recovery: Remove duplicate variables and functions (diff) | |
download | android_bootable_recovery-749054e1e34272fc7ed987bfc2f4e24e8b9565ac.tar android_bootable_recovery-749054e1e34272fc7ed987bfc2f4e24e8b9565ac.tar.gz android_bootable_recovery-749054e1e34272fc7ed987bfc2f4e24e8b9565ac.tar.bz2 android_bootable_recovery-749054e1e34272fc7ed987bfc2f4e24e8b9565ac.tar.lz android_bootable_recovery-749054e1e34272fc7ed987bfc2f4e24e8b9565ac.tar.xz android_bootable_recovery-749054e1e34272fc7ed987bfc2f4e24e8b9565ac.tar.zst android_bootable_recovery-749054e1e34272fc7ed987bfc2f4e24e8b9565ac.zip |
Diffstat (limited to 'screen_ui.h')
-rw-r--r-- | screen_ui.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/screen_ui.h b/screen_ui.h index 08a5f44a9..6d1191087 100644 --- a/screen_ui.h +++ b/screen_ui.h @@ -71,9 +71,7 @@ class ScreenRecoveryUI : public RecoveryUI { Icon currentIcon; int installingFrame; const char* locale; - bool rtl_locale; - pthread_mutex_t updateMutex; GRSurface* backgroundIcon[5]; GRSurface* backgroundText[5]; GRSurface** installation; @@ -136,9 +134,12 @@ 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, GRSurface** surface); void LoadBitmapArray(const char* filename, int* frames, int* fps, GRSurface*** surface); void LoadLocalizedBitmap(const char* filename, GRSurface** surface); + protected: + pthread_mutex_t updateMutex; + bool rtl_locale; + void LoadBitmap(const char* filename, GRSurface** surface); }; #endif // RECOVERY_UI_H |