summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker <dougz@google.com>2012-08-30 01:01:47 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-30 01:01:47 +0200
commita0ba2d3a6299a3931821b5c6ae10964e6815e8ea (patch)
tree13812661982fda40e2261c45ce25e8c68856701c
parentam d52ef348: am bddbb5b3: Merge "Fixing trivial warnings for libminui" (diff)
parentMerge "recovery locale handling fixes" into jb-mr1-dev (diff)
downloadandroid_bootable_recovery-a0ba2d3a6299a3931821b5c6ae10964e6815e8ea.tar
android_bootable_recovery-a0ba2d3a6299a3931821b5c6ae10964e6815e8ea.tar.gz
android_bootable_recovery-a0ba2d3a6299a3931821b5c6ae10964e6815e8ea.tar.bz2
android_bootable_recovery-a0ba2d3a6299a3931821b5c6ae10964e6815e8ea.tar.lz
android_bootable_recovery-a0ba2d3a6299a3931821b5c6ae10964e6815e8ea.tar.xz
android_bootable_recovery-a0ba2d3a6299a3931821b5c6ae10964e6815e8ea.tar.zst
android_bootable_recovery-a0ba2d3a6299a3931821b5c6ae10964e6815e8ea.zip
Diffstat (limited to '')
-rw-r--r--minui/resources.c8
-rw-r--r--recovery.cpp2
-rw-r--r--res/images/erasing_text.pngbin4511 -> 1492 bytes
-rw-r--r--res/images/error_text.pngbin3119 -> 844 bytes
-rw-r--r--res/images/installing_text.pngbin6433 -> 6785 bytes
-rw-r--r--res/images/no_command_text.pngbin2528 -> 1868 bytes
6 files changed, 1 insertions, 9 deletions
diff --git a/minui/resources.c b/minui/resources.c
index 60f354254..ac7bdac4c 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
--- a/res/images/erasing_text.png
+++ b/res/images/erasing_text.png
Binary files differ
diff --git a/res/images/error_text.png b/res/images/error_text.png
index 581347094..91be5fe54 100644
--- a/res/images/error_text.png
+++ b/res/images/error_text.png
Binary files differ
diff --git a/res/images/installing_text.png b/res/images/installing_text.png
index c48a45295..0557350ef 100644
--- a/res/images/installing_text.png
+++ b/res/images/installing_text.png
Binary files differ
diff --git a/res/images/no_command_text.png b/res/images/no_command_text.png
index 1d6a5b7cf..fbc20743f 100644
--- a/res/images/no_command_text.png
+++ b/res/images/no_command_text.png
Binary files differ