summaryrefslogtreecommitdiffstats
path: root/screen_ui.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-15 21:22:52 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-15 21:22:52 +0200
commita441133871b4ad361c3c873b2b2faca500b2afb8 (patch)
tree625c21a7688ed613dd22fc9fc9e6c68cec7c44bc /screen_ui.cpp
parentam 98bfb6f7: am 6e435abf: Merge "Move the menu header out of the menu." (diff)
parentam 7176a617: Merge "Don\'t use typedefs that hide *s." (diff)
downloadandroid_bootable_recovery-a441133871b4ad361c3c873b2b2faca500b2afb8.tar
android_bootable_recovery-a441133871b4ad361c3c873b2b2faca500b2afb8.tar.gz
android_bootable_recovery-a441133871b4ad361c3c873b2b2faca500b2afb8.tar.bz2
android_bootable_recovery-a441133871b4ad361c3c873b2b2faca500b2afb8.tar.lz
android_bootable_recovery-a441133871b4ad361c3c873b2b2faca500b2afb8.tar.xz
android_bootable_recovery-a441133871b4ad361c3c873b2b2faca500b2afb8.tar.zst
android_bootable_recovery-a441133871b4ad361c3c873b2b2faca500b2afb8.zip
Diffstat (limited to 'screen_ui.cpp')
-rw-r--r--screen_ui.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp
index 52f22c246..5e73d37c4 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -89,11 +89,11 @@ void ScreenRecoveryUI::draw_background_locked(Icon icon) {
gr_clear();
if (icon) {
- gr_surface surface = backgroundIcon[icon];
+ GRSurface* surface = backgroundIcon[icon];
if (icon == INSTALLING_UPDATE || icon == ERASING) {
surface = installation[installingFrame];
}
- gr_surface text_surface = backgroundText[icon];
+ GRSurface* text_surface = backgroundText[icon];
int iconWidth = gr_get_width(surface);
int iconHeight = gr_get_height(surface);
@@ -132,7 +132,7 @@ void ScreenRecoveryUI::draw_progress_locked() {
if (currentIcon == ERROR) return;
if (currentIcon == INSTALLING_UPDATE || currentIcon == ERASING) {
- gr_surface icon = installation[installingFrame];
+ GRSurface* icon = installation[installingFrame];
gr_blit(icon, 0, 0, gr_get_width(icon), gr_get_height(icon), iconX, iconY);
}
@@ -357,21 +357,21 @@ void ScreenRecoveryUI::ProgressThreadLoop() {
}
}
-void ScreenRecoveryUI::LoadBitmap(const char* filename, gr_surface* surface) {
+void ScreenRecoveryUI::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 ScreenRecoveryUI::LoadBitmapArray(const char* filename, int* frames, gr_surface** surface) {
+void ScreenRecoveryUI::LoadBitmapArray(const char* filename, int* frames, GRSurface*** surface) {
int result = res_create_multi_display_surface(filename, frames, surface);
if (result < 0) {
LOGE("missing bitmap %s\n(Code %d)\n", filename, result);
}
}
-void ScreenRecoveryUI::LoadLocalizedBitmap(const char* filename, gr_surface* surface) {
+void ScreenRecoveryUI::LoadLocalizedBitmap(const char* filename, GRSurface** surface) {
int result = res_create_localized_alpha_surface(filename, locale, surface);
if (result < 0) {
LOGE("missing bitmap %s\n(Code %d)\n", filename, result);