Commits

Anonymous committed 8b240cc

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

Comments (0)

Files changed (6)

minui/resources.c

     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;
     }
 
         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;
             *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);
 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

Old
Old image
New
New image

res/images/error_text.png

Old
Old image
New
New image

res/images/installing_text.png

Old
Old image
New
New image

res/images/no_command_text.png

Old
Old image
New
New image