From 8b240ccca1ad32cbd09d3807614f3086914ceaaf Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Wed, 29 Aug 2012 15:19:29 -0700 Subject: recovery locale handling fixes - change locale filename to "last_locale" so the main system doesn't delete it - clean up some chatty logging - update images with real German (other languages TBD) Change-Id: I2ebb4ed4e054bd1808a3042d9efbb2c18f3a044d --- minui/resources.c | 8 -------- recovery.cpp | 2 +- res/images/erasing_text.png | Bin 4511 -> 1492 bytes res/images/error_text.png | Bin 3119 -> 844 bytes res/images/installing_text.png | Bin 6433 -> 6785 bytes res/images/no_command_text.png | Bin 2528 -> 1868 bytes 6 files changed, 1 insertion(+), 9 deletions(-) diff --git a/minui/resources.c b/minui/resources.c index af8720a56..b5c99517b 100644 --- a/minui/resources.c +++ b/minui/resources.c @@ -249,18 +249,13 @@ int res_create_localized_surface(const char* name, gr_surface* pSurface) { size_t height = info_ptr->height; size_t stride = 4 * width; - printf("image size is %d x %d\n", width, height); - int color_type = info_ptr->color_type; int bit_depth = info_ptr->bit_depth; int channels = info_ptr->channels; - printf("color_type %d bit_depth %d channels %d\n", - color_type, bit_depth, channels); if (!(bit_depth == 8 && (channels == 1 && color_type == PNG_COLOR_TYPE_GRAY))) { return -7; - printf("exiting -7\n"); goto exit; } @@ -276,8 +271,6 @@ int res_create_localized_surface(const char* name, gr_surface* pSurface) { printf("row %d: %s %d x %d\n", y, loc, w, h); if (y+1+h >= height || matches_locale(loc)) { - printf(" taking this one\n"); - surface = malloc(sizeof(GGLSurface)); if (surface == NULL) { result = -8; @@ -301,7 +294,6 @@ int res_create_localized_surface(const char* name, gr_surface* pSurface) { *pSurface = (gr_surface) surface; break; } else { - printf(" skipping\n"); int i; for (i = 0; i < h; ++i, ++y) { png_read_row(png_ptr, row, NULL); diff --git a/recovery.cpp b/recovery.cpp index 70817d307..6ced420d0 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -63,7 +63,7 @@ static const char *INTENT_FILE = "/cache/recovery/intent"; static const char *LOG_FILE = "/cache/recovery/log"; static const char *LAST_LOG_FILE = "/cache/recovery/last_log"; static const char *LAST_INSTALL_FILE = "/cache/recovery/last_install"; -static const char *LOCALE_FILE = "/cache/recovery/locale"; +static const char *LOCALE_FILE = "/cache/recovery/last_locale"; static const char *CACHE_ROOT = "/cache"; static const char *SDCARD_ROOT = "/sdcard"; static const char *TEMPORARY_LOG_FILE = "/tmp/recovery.log"; diff --git a/res/images/erasing_text.png b/res/images/erasing_text.png index f92119772..2cd2e3825 100644 Binary files a/res/images/erasing_text.png and b/res/images/erasing_text.png differ diff --git a/res/images/error_text.png b/res/images/error_text.png index 581347094..91be5fe54 100644 Binary files a/res/images/error_text.png and b/res/images/error_text.png differ diff --git a/res/images/installing_text.png b/res/images/installing_text.png index c48a45295..0557350ef 100644 Binary files a/res/images/installing_text.png and b/res/images/installing_text.png differ diff --git a/res/images/no_command_text.png b/res/images/no_command_text.png index 1d6a5b7cf..fbc20743f 100644 Binary files a/res/images/no_command_text.png and b/res/images/no_command_text.png differ -- cgit v1.2.3