commit aff4dbb0ae33e55785d1a11f93c1e20ebfed4a90
author Doug Zongker <dougz@google.com> Wed Aug 29 15:57:01 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 29 15:57:02 2012 -0700
tree 13812661982fda40e2261c45ce25e8c68856701c
parent d52ef348d5abb65cd067be334d37c86d621786b9
parent 8b240ccca1ad32cbd09d3807614f3086914ceaaf

Merge "recovery locale handling fixes" into jb-mr1-dev

minui/resources.c

diff --git a/minui/resources.c b/minui/resources.c
index 60f3542..ac7bdac 100644
--- a/minui/resources.c
+++ b/minui/resources.c
@@ -249,18 +249,13 @@
     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 @@
         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 @@
             *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);

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 70817d3..6ced420 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -63,7 +63,7 @@
 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";

res/images/erasing_text.png

diff --git a/res/images/erasing_text.png b/res/images/erasing_text.png
index f921197..2cd2e38 100644
--- a/res/images/erasing_text.png
+++ b/res/images/erasing_text.png
Binary files differ

res/images/error_text.png

diff --git a/res/images/error_text.png b/res/images/error_text.png
index 5813470..91be5fe 100644
--- a/res/images/error_text.png
+++ b/res/images/error_text.png
Binary files differ

res/images/installing_text.png

diff --git a/res/images/installing_text.png b/res/images/installing_text.png
index c48a452..0557350 100644
--- a/res/images/installing_text.png
+++ b/res/images/installing_text.png
Binary files differ

res/images/no_command_text.png

diff --git a/res/images/no_command_text.png b/res/images/no_command_text.png
index 1d6a5b7..fbc2074 100644
--- a/res/images/no_command_text.png
+++ b/res/images/no_command_text.png
Binary files differ