aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2010-11-01 10:40:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-01 10:40:33 -0700
commit02971af254e72d175832854501c0a19e3f06d491 (patch)
tree388d9f30b92cc532a54c299dd91b842778f5c8a6
parent7c3ee270ce65b2ff2e234a259bc5b69eab5e58dd (diff)
parent8521ef5965675da85c7bbbe9c8b86fe68716e855 (diff)
downloadbootable_recovery-02971af254e72d175832854501c0a19e3f06d491.zip
bootable_recovery-02971af254e72d175832854501c0a19e3f06d491.tar.gz
bootable_recovery-02971af254e72d175832854501c0a19e3f06d491.tar.bz2
am 8521ef59: am 51266d13: clear recovery framebuffers on allocation; display icon right after ui_init
* commit '8521ef5965675da85c7bbbe9c8b86fe68716e855': clear recovery framebuffers on allocation; display icon right after ui_init
-rw-r--r--minui/graphics.c3
-rw-r--r--recovery.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/minui/graphics.c b/minui/graphics.c
index adbfc09..4127c40 100644
--- a/minui/graphics.c
+++ b/minui/graphics.c
@@ -88,6 +88,7 @@ static int get_framebuffer(GGLSurface *fb)
fb->stride = vi.xres;
fb->data = bits;
fb->format = GGL_PIXEL_FORMAT_RGB_565;
+ memset(fb->data, 0, vi.yres * vi.xres * 2);
fb++;
@@ -97,6 +98,7 @@ static int get_framebuffer(GGLSurface *fb)
fb->stride = vi.xres;
fb->data = (void*) (((unsigned) bits) + vi.yres * vi.xres * 2);
fb->format = GGL_PIXEL_FORMAT_RGB_565;
+ memset(fb->data, 0, vi.yres * vi.xres * 2);
return fd;
}
@@ -277,7 +279,6 @@ int gr_init(void)
set_active_framebuffer(0);
gl->colorBuffer(gl, &gr_mem_surface);
-
gl->activeTexture(gl, 0);
gl->enable(gl, GGL_BLEND);
gl->blendFunc(gl, GGL_SRC_ALPHA, GGL_ONE_MINUS_SRC_ALPHA);
diff --git a/recovery.c b/recovery.c
index 452794a..9ad075d 100644
--- a/recovery.c
+++ b/recovery.c
@@ -701,6 +701,7 @@ main(int argc, char **argv) {
printf("Starting recovery on %s", ctime(&start));
ui_init();
+ ui_set_background(BACKGROUND_ICON_INSTALLING);
load_volume_table();
get_args(&argc, &argv);