From 4f33e55d1c38d2f72f3306a82c177850f3676408 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Thu, 23 Aug 2012 13:16:12 -0700 Subject: change recovery images to android with spinner Also make writing the locale a bit more robust. Change-Id: I803dd0aa0b9d6661fad74ea13fb085682402323c --- recovery.cpp | 21 ++++++++++++--------- res/images/icon_error.png | Bin 19306 -> 18244 bytes res/images/icon_installing.png | Bin 25261 -> 21072 bytes res/images/icon_installing_overlay01.png | Bin 10095 -> 8017 bytes res/images/icon_installing_overlay02.png | Bin 9990 -> 7803 bytes res/images/icon_installing_overlay03.png | Bin 9782 -> 7489 bytes res/images/icon_installing_overlay04.png | Bin 9817 -> 7150 bytes res/images/icon_installing_overlay05.png | Bin 9863 -> 7271 bytes res/images/icon_installing_overlay06.png | Bin 9944 -> 7400 bytes res/images/icon_installing_overlay07.png | Bin 10062 -> 7568 bytes res/images/icon_installing_overlay08.png | Bin 0 -> 7901 bytes res/images/icon_installing_overlay09.png | Bin 0 -> 8455 bytes res/images/icon_installing_overlay10.png | Bin 0 -> 8740 bytes res/images/icon_installing_overlay11.png | Bin 0 -> 8764 bytes res/images/icon_installing_overlay12.png | Bin 0 -> 8547 bytes res/images/icon_installing_overlay13.png | Bin 0 -> 8405 bytes res/images/icon_installing_overlay14.png | Bin 0 -> 8114 bytes res/images/icon_installing_overlay15.png | Bin 0 -> 7740 bytes res/images/icon_installing_overlay16.png | Bin 0 -> 7685 bytes res/images/icon_installing_overlay17.png | Bin 0 -> 7719 bytes res/images/icon_installing_overlay18.png | Bin 0 -> 7565 bytes res/images/icon_installing_overlay19.png | Bin 0 -> 7259 bytes res/images/icon_installing_overlay20.png | Bin 0 -> 6993 bytes res/images/icon_installing_overlay21.png | Bin 0 -> 7361 bytes res/images/icon_installing_overlay22.png | Bin 0 -> 7457 bytes res/images/icon_installing_overlay23.png | Bin 0 -> 7512 bytes res/images/icon_installing_overlay24.png | Bin 0 -> 7572 bytes res/images/icon_installing_overlay25.png | Bin 0 -> 7768 bytes res/images/icon_installing_overlay26.png | Bin 0 -> 8299 bytes res/images/icon_installing_overlay27.png | Bin 0 -> 8642 bytes res/images/icon_installing_overlay28.png | Bin 0 -> 8828 bytes res/images/icon_installing_overlay29.png | Bin 0 -> 8898 bytes res/images/icon_installing_overlay30.png | Bin 0 -> 8700 bytes res/images/icon_installing_overlay31.png | Bin 0 -> 8343 bytes res/images/icon_installing_overlay32.png | Bin 0 -> 7846 bytes res/images/icon_installing_overlay33.png | Bin 0 -> 7673 bytes res/images/icon_installing_overlay34.png | Bin 0 -> 7378 bytes res/images/icon_installing_overlay35.png | Bin 0 -> 7203 bytes res/images/icon_installing_overlay36.png | Bin 0 -> 7208 bytes res/images/icon_installing_overlay37.png | Bin 0 -> 7567 bytes res/images/icon_installing_overlay38.png | Bin 0 -> 7912 bytes res/images/icon_installing_overlay39.png | Bin 0 -> 8156 bytes res/images/icon_installing_overlay40.png | Bin 0 -> 8288 bytes res/images/icon_installing_overlay41.png | Bin 0 -> 8416 bytes res/images/icon_installing_overlay42.png | Bin 0 -> 8173 bytes res/images/icon_installing_overlay43.png | Bin 0 -> 7701 bytes res/images/icon_installing_overlay44.png | Bin 0 -> 7452 bytes res/images/icon_installing_overlay45.png | Bin 0 -> 7795 bytes res/images/icon_installing_overlay46.png | Bin 0 -> 8031 bytes res/images/icon_installing_overlay47.png | Bin 0 -> 8033 bytes res/images/icon_installing_overlay48.png | Bin 0 -> 8042 bytes res/images/indeterminate01.png | Bin 673 -> 592 bytes res/images/indeterminate02.png | Bin 687 -> 607 bytes res/images/indeterminate03.png | Bin 661 -> 559 bytes res/images/indeterminate04.png | Bin 665 -> 568 bytes res/images/indeterminate05.png | Bin 683 -> 559 bytes res/images/indeterminate06.png | Bin 676 -> 577 bytes res/images/indeterminate07.png | Bin 0 -> 590 bytes res/images/indeterminate08.png | Bin 0 -> 603 bytes res/images/indeterminate09.png | Bin 0 -> 597 bytes res/images/indeterminate10.png | Bin 0 -> 603 bytes res/images/indeterminate11.png | Bin 0 -> 603 bytes res/images/indeterminate12.png | Bin 0 -> 612 bytes res/images/indeterminate13.png | Bin 0 -> 616 bytes res/images/indeterminate14.png | Bin 0 -> 608 bytes res/images/indeterminate15.png | Bin 0 -> 627 bytes res/images/indeterminate16.png | Bin 0 -> 617 bytes screen_ui.cpp | 8 ++++---- 68 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 res/images/icon_installing_overlay08.png create mode 100644 res/images/icon_installing_overlay09.png create mode 100644 res/images/icon_installing_overlay10.png create mode 100644 res/images/icon_installing_overlay11.png create mode 100644 res/images/icon_installing_overlay12.png create mode 100644 res/images/icon_installing_overlay13.png create mode 100644 res/images/icon_installing_overlay14.png create mode 100644 res/images/icon_installing_overlay15.png create mode 100644 res/images/icon_installing_overlay16.png create mode 100644 res/images/icon_installing_overlay17.png create mode 100644 res/images/icon_installing_overlay18.png create mode 100644 res/images/icon_installing_overlay19.png create mode 100644 res/images/icon_installing_overlay20.png create mode 100644 res/images/icon_installing_overlay21.png create mode 100644 res/images/icon_installing_overlay22.png create mode 100644 res/images/icon_installing_overlay23.png create mode 100644 res/images/icon_installing_overlay24.png create mode 100644 res/images/icon_installing_overlay25.png create mode 100644 res/images/icon_installing_overlay26.png create mode 100644 res/images/icon_installing_overlay27.png create mode 100644 res/images/icon_installing_overlay28.png create mode 100644 res/images/icon_installing_overlay29.png create mode 100644 res/images/icon_installing_overlay30.png create mode 100644 res/images/icon_installing_overlay31.png create mode 100644 res/images/icon_installing_overlay32.png create mode 100644 res/images/icon_installing_overlay33.png create mode 100644 res/images/icon_installing_overlay34.png create mode 100644 res/images/icon_installing_overlay35.png create mode 100644 res/images/icon_installing_overlay36.png create mode 100644 res/images/icon_installing_overlay37.png create mode 100644 res/images/icon_installing_overlay38.png create mode 100644 res/images/icon_installing_overlay39.png create mode 100644 res/images/icon_installing_overlay40.png create mode 100644 res/images/icon_installing_overlay41.png create mode 100644 res/images/icon_installing_overlay42.png create mode 100644 res/images/icon_installing_overlay43.png create mode 100644 res/images/icon_installing_overlay44.png create mode 100644 res/images/icon_installing_overlay45.png create mode 100644 res/images/icon_installing_overlay46.png create mode 100644 res/images/icon_installing_overlay47.png create mode 100644 res/images/icon_installing_overlay48.png create mode 100644 res/images/indeterminate07.png create mode 100644 res/images/indeterminate08.png create mode 100644 res/images/indeterminate09.png create mode 100644 res/images/indeterminate10.png create mode 100644 res/images/indeterminate11.png create mode 100644 res/images/indeterminate12.png create mode 100644 res/images/indeterminate13.png create mode 100644 res/images/indeterminate14.png create mode 100644 res/images/indeterminate15.png create mode 100644 res/images/indeterminate16.png diff --git a/recovery.cpp b/recovery.cpp index e374c7d5a..70817d307 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -277,6 +277,18 @@ finish_recovery(const char *send_intent) { } } + // Save the locale to cache, so if recovery is next started up + // without a --locale argument (eg, directly from the bootloader) + // it will use the last-known locale. + if (locale != NULL) { + LOGI("Saving locale \"%s\"\n", locale); + FILE* fp = fopen_path(LOCALE_FILE, "w"); + fwrite(locale, 1, strlen(locale), fp); + fflush(fp); + fsync(fileno(fp)); + check_and_fclose(fp, LOCALE_FILE); + } + // Copy logs to cache so the system can find out what happened. copy_log_file(TEMPORARY_LOG_FILE, LOG_FILE, true); copy_log_file(TEMPORARY_LOG_FILE, LAST_LOG_FILE, false); @@ -286,15 +298,6 @@ finish_recovery(const char *send_intent) { chmod(LAST_LOG_FILE, 0640); chmod(LAST_INSTALL_FILE, 0644); - // Save the locale to cache, so if recovery is next started up - // without a --locale argument (eg, directly from the bootloader) - // it will use the last-known locale. - if (locale != NULL) { - FILE* fp = fopen(LOCALE_FILE, "w"); - fwrite(locale, 1, strlen(locale), fp); - fclose(fp); - } - // Reset to normal system boot so recovery won't cycle indefinitely. struct bootloader_message boot; memset(&boot, 0, sizeof(boot)); diff --git a/res/images/icon_error.png b/res/images/icon_error.png index cb3d1ab22..7000d4d8a 100644 Binary files a/res/images/icon_error.png and b/res/images/icon_error.png differ diff --git a/res/images/icon_installing.png b/res/images/icon_installing.png index 571eb8b0f..ad7927753 100644 Binary files a/res/images/icon_installing.png and b/res/images/icon_installing.png differ diff --git a/res/images/icon_installing_overlay01.png b/res/images/icon_installing_overlay01.png index e762d6cbe..c9f6125d9 100644 Binary files a/res/images/icon_installing_overlay01.png and b/res/images/icon_installing_overlay01.png differ diff --git a/res/images/icon_installing_overlay02.png b/res/images/icon_installing_overlay02.png index f7a853017..c87e5fa92 100644 Binary files a/res/images/icon_installing_overlay02.png and b/res/images/icon_installing_overlay02.png differ diff --git a/res/images/icon_installing_overlay03.png b/res/images/icon_installing_overlay03.png index 1a1d738e4..30e95803f 100644 Binary files a/res/images/icon_installing_overlay03.png and b/res/images/icon_installing_overlay03.png differ diff --git a/res/images/icon_installing_overlay04.png b/res/images/icon_installing_overlay04.png index a74903d33..6f1f9cf0d 100644 Binary files a/res/images/icon_installing_overlay04.png and b/res/images/icon_installing_overlay04.png differ diff --git a/res/images/icon_installing_overlay05.png b/res/images/icon_installing_overlay05.png index d17bdc006..8791abdbd 100644 Binary files a/res/images/icon_installing_overlay05.png and b/res/images/icon_installing_overlay05.png differ diff --git a/res/images/icon_installing_overlay06.png b/res/images/icon_installing_overlay06.png index 1200b75cb..08a0133b0 100644 Binary files a/res/images/icon_installing_overlay06.png and b/res/images/icon_installing_overlay06.png differ diff --git a/res/images/icon_installing_overlay07.png b/res/images/icon_installing_overlay07.png index 3838a85ad..15b53d9b7 100644 Binary files a/res/images/icon_installing_overlay07.png and b/res/images/icon_installing_overlay07.png differ diff --git a/res/images/icon_installing_overlay08.png b/res/images/icon_installing_overlay08.png new file mode 100644 index 000000000..bb4987894 Binary files /dev/null and b/res/images/icon_installing_overlay08.png differ diff --git a/res/images/icon_installing_overlay09.png b/res/images/icon_installing_overlay09.png new file mode 100644 index 000000000..e8715fcfa Binary files /dev/null and b/res/images/icon_installing_overlay09.png differ diff --git a/res/images/icon_installing_overlay10.png b/res/images/icon_installing_overlay10.png new file mode 100644 index 000000000..4ad81bf71 Binary files /dev/null and b/res/images/icon_installing_overlay10.png differ diff --git a/res/images/icon_installing_overlay11.png b/res/images/icon_installing_overlay11.png new file mode 100644 index 000000000..b3ae7e3ad Binary files /dev/null and b/res/images/icon_installing_overlay11.png differ diff --git a/res/images/icon_installing_overlay12.png b/res/images/icon_installing_overlay12.png new file mode 100644 index 000000000..5e7fd04a6 Binary files /dev/null and b/res/images/icon_installing_overlay12.png differ diff --git a/res/images/icon_installing_overlay13.png b/res/images/icon_installing_overlay13.png new file mode 100644 index 000000000..4e4dbe923 Binary files /dev/null and b/res/images/icon_installing_overlay13.png differ diff --git a/res/images/icon_installing_overlay14.png b/res/images/icon_installing_overlay14.png new file mode 100644 index 000000000..55e19b5e4 Binary files /dev/null and b/res/images/icon_installing_overlay14.png differ diff --git a/res/images/icon_installing_overlay15.png b/res/images/icon_installing_overlay15.png new file mode 100644 index 000000000..ac5fb991c Binary files /dev/null and b/res/images/icon_installing_overlay15.png differ diff --git a/res/images/icon_installing_overlay16.png b/res/images/icon_installing_overlay16.png new file mode 100644 index 000000000..6461d70f1 Binary files /dev/null and b/res/images/icon_installing_overlay16.png differ diff --git a/res/images/icon_installing_overlay17.png b/res/images/icon_installing_overlay17.png new file mode 100644 index 000000000..cc981d347 Binary files /dev/null and b/res/images/icon_installing_overlay17.png differ diff --git a/res/images/icon_installing_overlay18.png b/res/images/icon_installing_overlay18.png new file mode 100644 index 000000000..2b3221444 Binary files /dev/null and b/res/images/icon_installing_overlay18.png differ diff --git a/res/images/icon_installing_overlay19.png b/res/images/icon_installing_overlay19.png new file mode 100644 index 000000000..d379e51a1 Binary files /dev/null and b/res/images/icon_installing_overlay19.png differ diff --git a/res/images/icon_installing_overlay20.png b/res/images/icon_installing_overlay20.png new file mode 100644 index 000000000..362a8cabc Binary files /dev/null and b/res/images/icon_installing_overlay20.png differ diff --git a/res/images/icon_installing_overlay21.png b/res/images/icon_installing_overlay21.png new file mode 100644 index 000000000..0b6559222 Binary files /dev/null and b/res/images/icon_installing_overlay21.png differ diff --git a/res/images/icon_installing_overlay22.png b/res/images/icon_installing_overlay22.png new file mode 100644 index 000000000..51d5cbadf Binary files /dev/null and b/res/images/icon_installing_overlay22.png differ diff --git a/res/images/icon_installing_overlay23.png b/res/images/icon_installing_overlay23.png new file mode 100644 index 000000000..59148e5cc Binary files /dev/null and b/res/images/icon_installing_overlay23.png differ diff --git a/res/images/icon_installing_overlay24.png b/res/images/icon_installing_overlay24.png new file mode 100644 index 000000000..d315673b4 Binary files /dev/null and b/res/images/icon_installing_overlay24.png differ diff --git a/res/images/icon_installing_overlay25.png b/res/images/icon_installing_overlay25.png new file mode 100644 index 000000000..1eb7843e3 Binary files /dev/null and b/res/images/icon_installing_overlay25.png differ diff --git a/res/images/icon_installing_overlay26.png b/res/images/icon_installing_overlay26.png new file mode 100644 index 000000000..14a024dcf Binary files /dev/null and b/res/images/icon_installing_overlay26.png differ diff --git a/res/images/icon_installing_overlay27.png b/res/images/icon_installing_overlay27.png new file mode 100644 index 000000000..035c16340 Binary files /dev/null and b/res/images/icon_installing_overlay27.png differ diff --git a/res/images/icon_installing_overlay28.png b/res/images/icon_installing_overlay28.png new file mode 100644 index 000000000..75483864f Binary files /dev/null and b/res/images/icon_installing_overlay28.png differ diff --git a/res/images/icon_installing_overlay29.png b/res/images/icon_installing_overlay29.png new file mode 100644 index 000000000..836d3138f Binary files /dev/null and b/res/images/icon_installing_overlay29.png differ diff --git a/res/images/icon_installing_overlay30.png b/res/images/icon_installing_overlay30.png new file mode 100644 index 000000000..e470a7e1e Binary files /dev/null and b/res/images/icon_installing_overlay30.png differ diff --git a/res/images/icon_installing_overlay31.png b/res/images/icon_installing_overlay31.png new file mode 100644 index 000000000..bed0c65aa Binary files /dev/null and b/res/images/icon_installing_overlay31.png differ diff --git a/res/images/icon_installing_overlay32.png b/res/images/icon_installing_overlay32.png new file mode 100644 index 000000000..51811e0ac Binary files /dev/null and b/res/images/icon_installing_overlay32.png differ diff --git a/res/images/icon_installing_overlay33.png b/res/images/icon_installing_overlay33.png new file mode 100644 index 000000000..f1fc656d5 Binary files /dev/null and b/res/images/icon_installing_overlay33.png differ diff --git a/res/images/icon_installing_overlay34.png b/res/images/icon_installing_overlay34.png new file mode 100644 index 000000000..5791a7d16 Binary files /dev/null and b/res/images/icon_installing_overlay34.png differ diff --git a/res/images/icon_installing_overlay35.png b/res/images/icon_installing_overlay35.png new file mode 100644 index 000000000..0769ec9eb Binary files /dev/null and b/res/images/icon_installing_overlay35.png differ diff --git a/res/images/icon_installing_overlay36.png b/res/images/icon_installing_overlay36.png new file mode 100644 index 000000000..28a692bd2 Binary files /dev/null and b/res/images/icon_installing_overlay36.png differ diff --git a/res/images/icon_installing_overlay37.png b/res/images/icon_installing_overlay37.png new file mode 100644 index 000000000..12b21cfae Binary files /dev/null and b/res/images/icon_installing_overlay37.png differ diff --git a/res/images/icon_installing_overlay38.png b/res/images/icon_installing_overlay38.png new file mode 100644 index 000000000..f8ef9967d Binary files /dev/null and b/res/images/icon_installing_overlay38.png differ diff --git a/res/images/icon_installing_overlay39.png b/res/images/icon_installing_overlay39.png new file mode 100644 index 000000000..f929119ab Binary files /dev/null and b/res/images/icon_installing_overlay39.png differ diff --git a/res/images/icon_installing_overlay40.png b/res/images/icon_installing_overlay40.png new file mode 100644 index 000000000..ceed45759 Binary files /dev/null and b/res/images/icon_installing_overlay40.png differ diff --git a/res/images/icon_installing_overlay41.png b/res/images/icon_installing_overlay41.png new file mode 100644 index 000000000..34cf1aec4 Binary files /dev/null and b/res/images/icon_installing_overlay41.png differ diff --git a/res/images/icon_installing_overlay42.png b/res/images/icon_installing_overlay42.png new file mode 100644 index 000000000..d622417ac Binary files /dev/null and b/res/images/icon_installing_overlay42.png differ diff --git a/res/images/icon_installing_overlay43.png b/res/images/icon_installing_overlay43.png new file mode 100644 index 000000000..9902df1a7 Binary files /dev/null and b/res/images/icon_installing_overlay43.png differ diff --git a/res/images/icon_installing_overlay44.png b/res/images/icon_installing_overlay44.png new file mode 100644 index 000000000..b5d7911e1 Binary files /dev/null and b/res/images/icon_installing_overlay44.png differ diff --git a/res/images/icon_installing_overlay45.png b/res/images/icon_installing_overlay45.png new file mode 100644 index 000000000..dfbf408b6 Binary files /dev/null and b/res/images/icon_installing_overlay45.png differ diff --git a/res/images/icon_installing_overlay46.png b/res/images/icon_installing_overlay46.png new file mode 100644 index 000000000..495bb90df Binary files /dev/null and b/res/images/icon_installing_overlay46.png differ diff --git a/res/images/icon_installing_overlay47.png b/res/images/icon_installing_overlay47.png new file mode 100644 index 000000000..9d6937866 Binary files /dev/null and b/res/images/icon_installing_overlay47.png differ diff --git a/res/images/icon_installing_overlay48.png b/res/images/icon_installing_overlay48.png new file mode 100644 index 000000000..a5080af97 Binary files /dev/null and b/res/images/icon_installing_overlay48.png differ diff --git a/res/images/indeterminate01.png b/res/images/indeterminate01.png index 933528d6d..4db384337 100644 Binary files a/res/images/indeterminate01.png and b/res/images/indeterminate01.png differ diff --git a/res/images/indeterminate02.png b/res/images/indeterminate02.png index d760e2bdd..761b2332f 100644 Binary files a/res/images/indeterminate02.png and b/res/images/indeterminate02.png differ diff --git a/res/images/indeterminate03.png b/res/images/indeterminate03.png index 0e97399d1..e2617abcb 100644 Binary files a/res/images/indeterminate03.png and b/res/images/indeterminate03.png differ diff --git a/res/images/indeterminate04.png b/res/images/indeterminate04.png index c7d5b4e04..132940e50 100644 Binary files a/res/images/indeterminate04.png and b/res/images/indeterminate04.png differ diff --git a/res/images/indeterminate05.png b/res/images/indeterminate05.png index d6fb2a032..a17032c2d 100644 Binary files a/res/images/indeterminate05.png and b/res/images/indeterminate05.png differ diff --git a/res/images/indeterminate06.png b/res/images/indeterminate06.png index 44867619f..efaac42e6 100644 Binary files a/res/images/indeterminate06.png and b/res/images/indeterminate06.png differ diff --git a/res/images/indeterminate07.png b/res/images/indeterminate07.png new file mode 100644 index 000000000..6e84a5a0f Binary files /dev/null and b/res/images/indeterminate07.png differ diff --git a/res/images/indeterminate08.png b/res/images/indeterminate08.png new file mode 100644 index 000000000..58c112e38 Binary files /dev/null and b/res/images/indeterminate08.png differ diff --git a/res/images/indeterminate09.png b/res/images/indeterminate09.png new file mode 100644 index 000000000..b25145f12 Binary files /dev/null and b/res/images/indeterminate09.png differ diff --git a/res/images/indeterminate10.png b/res/images/indeterminate10.png new file mode 100644 index 000000000..4ff7e2527 Binary files /dev/null and b/res/images/indeterminate10.png differ diff --git a/res/images/indeterminate11.png b/res/images/indeterminate11.png new file mode 100644 index 000000000..4860c2a02 Binary files /dev/null and b/res/images/indeterminate11.png differ diff --git a/res/images/indeterminate12.png b/res/images/indeterminate12.png new file mode 100644 index 000000000..a249c225b Binary files /dev/null and b/res/images/indeterminate12.png differ diff --git a/res/images/indeterminate13.png b/res/images/indeterminate13.png new file mode 100644 index 000000000..1b70dc072 Binary files /dev/null and b/res/images/indeterminate13.png differ diff --git a/res/images/indeterminate14.png b/res/images/indeterminate14.png new file mode 100644 index 000000000..a5f779f73 Binary files /dev/null and b/res/images/indeterminate14.png differ diff --git a/res/images/indeterminate15.png b/res/images/indeterminate15.png new file mode 100644 index 000000000..018fa685c Binary files /dev/null and b/res/images/indeterminate15.png differ diff --git a/res/images/indeterminate16.png b/res/images/indeterminate16.png new file mode 100644 index 000000000..e8e05b6d3 Binary files /dev/null and b/res/images/indeterminate16.png differ diff --git a/screen_ui.cpp b/screen_ui.cpp index bb879dfac..1f2471ade 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -75,10 +75,10 @@ ScreenRecoveryUI::ScreenRecoveryUI() : // that overrides Init() to set these values appropriately and // then call the superclass Init(). animation_fps(20), - indeterminate_frames(6), - installing_frames(7), - install_overlay_offset_x(13), - install_overlay_offset_y(190) { + indeterminate_frames(16), + installing_frames(48), + install_overlay_offset_x(65), + install_overlay_offset_y(106) { pthread_mutex_init(&updateMutex, NULL); self = this; } -- cgit v1.2.3