summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrashant Malani <pmalani@google.com>2016-03-11 19:31:00 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-03-11 19:31:00 +0100
commit749054e1e34272fc7ed987bfc2f4e24e8b9565ac (patch)
tree44356694d9dcd71287e497ee98ec987809800a29
parentMerge "Reboot and retry on I/O errors" into nyc-dev (diff)
parentrecovery: Remove duplicate variables and functions (diff)
downloadandroid_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
-rw-r--r--screen_ui.cpp4
-rw-r--r--screen_ui.h7
-rw-r--r--wear_ui.cpp9
-rw-r--r--wear_ui.h4
4 files changed, 6 insertions, 18 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp
index 522aa6b23..9f72de4b8 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -54,7 +54,6 @@ ScreenRecoveryUI::ScreenRecoveryUI() :
currentIcon(NONE),
installingFrame(0),
locale(nullptr),
- rtl_locale(false),
progressBarType(EMPTY),
progressScopeStart(0),
progressScopeSize(0),
@@ -76,7 +75,8 @@ ScreenRecoveryUI::ScreenRecoveryUI() :
animation_fps(-1),
installing_frames(-1),
stage(-1),
- max_stage(-1) {
+ max_stage(-1),
+ rtl_locale(false) {
for (int i = 0; i < 5; i++) {
backgroundIcon[i] = nullptr;
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
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 65bcd8494..e76af8d6b 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -62,7 +62,6 @@ WearRecoveryUI::WearRecoveryUI() :
currentIcon(NONE),
intro_done(false),
current_frame(0),
- rtl_locale(false),
progressBarType(EMPTY),
progressScopeStart(0),
progressScopeSize(0),
@@ -81,7 +80,6 @@ WearRecoveryUI::WearRecoveryUI() :
for (size_t i = 0; i < 5; i++)
backgroundIcon[i] = NULL;
- pthread_mutex_init(&updateMutex, NULL);
self = this;
}
@@ -321,13 +319,6 @@ void WearRecoveryUI::progress_loop() {
}
}
-void WearRecoveryUI::LoadBitmap(const char* filename, GRSurface** surface) {
- int result = res_create_display_surface(filename, surface);
- if (result < 0) {
- LOGE("missing bitmap %s\n(Code %d)\n", filename, result);
- }
-}
-
void WearRecoveryUI::Init()
{
gr_init();
diff --git a/wear_ui.h b/wear_ui.h
index 35ea51660..92cd320bb 100644
--- a/wear_ui.h
+++ b/wear_ui.h
@@ -84,9 +84,6 @@ class WearRecoveryUI : public ScreenRecoveryUI {
int current_frame;
- bool rtl_locale;
-
- pthread_mutex_t updateMutex;
GRSurface* backgroundIcon[5];
GRSurface* *introFrames;
GRSurface* *loopFrames;
@@ -123,7 +120,6 @@ class WearRecoveryUI : public ScreenRecoveryUI {
void update_screen_locked();
static void* progress_thread(void* cookie);
void progress_loop();
- void LoadBitmap(const char* filename, GRSurface** surface);
void PutChar(char);
void ClearText();
void DrawTextLine(int x, int* y, const char* line, bool bold);