diff --git a/recovery.cpp b/recovery.cpp index e374c7d5..70817d30 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 cb3d1ab2..7000d4d8 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 571eb8b0..ad792775 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 e762d6cb..c9f6125d 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 f7a85301..c87e5fa9 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 1a1d738e..30e95803 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 a74903d3..6f1f9cf0 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 d17bdc00..8791abdb 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 1200b75c..08a0133b 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 3838a85a..15b53d9b 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 00000000..bb498789 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 00000000..e8715fcf 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 00000000..4ad81bf7 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 00000000..b3ae7e3a 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 00000000..5e7fd04a 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 00000000..4e4dbe92 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 00000000..55e19b5e 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 00000000..ac5fb991 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 00000000..6461d70f 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 00000000..cc981d34 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 00000000..2b322144 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 00000000..d379e51a 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 00000000..362a8cab 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 00000000..0b655922 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 00000000..51d5cbad 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 00000000..59148e5c 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 00000000..d315673b 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 00000000..1eb7843e 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 00000000..14a024dc 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 00000000..035c1634 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 00000000..75483864 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 00000000..836d3138 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 00000000..e470a7e1 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 00000000..bed0c65a 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 00000000..51811e0a 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 00000000..f1fc656d 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 00000000..5791a7d1 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 00000000..0769ec9e 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 00000000..28a692bd 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 00000000..12b21cfa 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 00000000..f8ef9967 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 00000000..f929119a 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 00000000..ceed4575 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 00000000..34cf1aec 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 00000000..d622417a 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 00000000..9902df1a 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 00000000..b5d7911e 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 00000000..dfbf408b 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 00000000..495bb90d 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 00000000..9d693786 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 00000000..a5080af9 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 933528d6..4db38433 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 d760e2bd..761b2332 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 0e97399d..e2617abc 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 c7d5b4e0..132940e5 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 d6fb2a03..a17032c2 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 44867619..efaac42e 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 00000000..6e84a5a0 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 00000000..58c112e3 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 00000000..b25145f1 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 00000000..4ff7e252 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 00000000..4860c2a0 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 00000000..a249c225 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 00000000..1b70dc07 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 00000000..a5f779f7 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 00000000..018fa685 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 00000000..e8e05b6d Binary files /dev/null and b/res/images/indeterminate16.png differ diff --git a/screen_ui.cpp b/screen_ui.cpp index bb879dfa..1f2471ad 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; }