diff options
| author | Doug Zongker <dougz@google.com> | 2012-08-23 22:24:36 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-23 22:24:36 +0200 |
| commit | cf9f4e0020dadc71d50110764d407377ce09ea2d (patch) | |
| tree | 26f0cfb8893bf21faaf3ec6ad1670159a01d454b | |
| parent | am 02ec6b88: add simple text to recovery UI (diff) | |
| parent | change recovery images to android with spinner (diff) | |
| download | android_bootable_recovery-cf9f4e0020dadc71d50110764d407377ce09ea2d.tar android_bootable_recovery-cf9f4e0020dadc71d50110764d407377ce09ea2d.tar.gz android_bootable_recovery-cf9f4e0020dadc71d50110764d407377ce09ea2d.tar.bz2 android_bootable_recovery-cf9f4e0020dadc71d50110764d407377ce09ea2d.tar.lz android_bootable_recovery-cf9f4e0020dadc71d50110764d407377ce09ea2d.tar.xz android_bootable_recovery-cf9f4e0020dadc71d50110764d407377ce09ea2d.tar.zst android_bootable_recovery-cf9f4e0020dadc71d50110764d407377ce09ea2d.zip | |
Diffstat (limited to '')
68 files changed, 16 insertions, 13 deletions
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 Binary files differindex cb3d1ab22..7000d4d8a 100644 --- a/res/images/icon_error.png +++ b/res/images/icon_error.png diff --git a/res/images/icon_installing.png b/res/images/icon_installing.png Binary files differindex 571eb8b0f..ad7927753 100644 --- a/res/images/icon_installing.png +++ b/res/images/icon_installing.png diff --git a/res/images/icon_installing_overlay01.png b/res/images/icon_installing_overlay01.png Binary files differindex e762d6cbe..c9f6125d9 100644 --- a/res/images/icon_installing_overlay01.png +++ b/res/images/icon_installing_overlay01.png diff --git a/res/images/icon_installing_overlay02.png b/res/images/icon_installing_overlay02.png Binary files differindex f7a853017..c87e5fa92 100644 --- a/res/images/icon_installing_overlay02.png +++ b/res/images/icon_installing_overlay02.png diff --git a/res/images/icon_installing_overlay03.png b/res/images/icon_installing_overlay03.png Binary files differindex 1a1d738e4..30e95803f 100644 --- a/res/images/icon_installing_overlay03.png +++ b/res/images/icon_installing_overlay03.png diff --git a/res/images/icon_installing_overlay04.png b/res/images/icon_installing_overlay04.png Binary files differindex a74903d33..6f1f9cf0d 100644 --- a/res/images/icon_installing_overlay04.png +++ b/res/images/icon_installing_overlay04.png diff --git a/res/images/icon_installing_overlay05.png b/res/images/icon_installing_overlay05.png Binary files differindex d17bdc006..8791abdbd 100644 --- a/res/images/icon_installing_overlay05.png +++ b/res/images/icon_installing_overlay05.png diff --git a/res/images/icon_installing_overlay06.png b/res/images/icon_installing_overlay06.png Binary files differindex 1200b75cb..08a0133b0 100644 --- a/res/images/icon_installing_overlay06.png +++ b/res/images/icon_installing_overlay06.png diff --git a/res/images/icon_installing_overlay07.png b/res/images/icon_installing_overlay07.png Binary files differindex 3838a85ad..15b53d9b7 100644 --- a/res/images/icon_installing_overlay07.png +++ b/res/images/icon_installing_overlay07.png diff --git a/res/images/icon_installing_overlay08.png b/res/images/icon_installing_overlay08.png Binary files differnew file mode 100644 index 000000000..bb4987894 --- /dev/null +++ b/res/images/icon_installing_overlay08.png diff --git a/res/images/icon_installing_overlay09.png b/res/images/icon_installing_overlay09.png Binary files differnew file mode 100644 index 000000000..e8715fcfa --- /dev/null +++ b/res/images/icon_installing_overlay09.png diff --git a/res/images/icon_installing_overlay10.png b/res/images/icon_installing_overlay10.png Binary files differnew file mode 100644 index 000000000..4ad81bf71 --- /dev/null +++ b/res/images/icon_installing_overlay10.png diff --git a/res/images/icon_installing_overlay11.png b/res/images/icon_installing_overlay11.png Binary files differnew file mode 100644 index 000000000..b3ae7e3ad --- /dev/null +++ b/res/images/icon_installing_overlay11.png diff --git a/res/images/icon_installing_overlay12.png b/res/images/icon_installing_overlay12.png Binary files differnew file mode 100644 index 000000000..5e7fd04a6 --- /dev/null +++ b/res/images/icon_installing_overlay12.png diff --git a/res/images/icon_installing_overlay13.png b/res/images/icon_installing_overlay13.png Binary files differnew file mode 100644 index 000000000..4e4dbe923 --- /dev/null +++ b/res/images/icon_installing_overlay13.png diff --git a/res/images/icon_installing_overlay14.png b/res/images/icon_installing_overlay14.png Binary files differnew file mode 100644 index 000000000..55e19b5e4 --- /dev/null +++ b/res/images/icon_installing_overlay14.png diff --git a/res/images/icon_installing_overlay15.png b/res/images/icon_installing_overlay15.png Binary files differnew file mode 100644 index 000000000..ac5fb991c --- /dev/null +++ b/res/images/icon_installing_overlay15.png diff --git a/res/images/icon_installing_overlay16.png b/res/images/icon_installing_overlay16.png Binary files differnew file mode 100644 index 000000000..6461d70f1 --- /dev/null +++ b/res/images/icon_installing_overlay16.png diff --git a/res/images/icon_installing_overlay17.png b/res/images/icon_installing_overlay17.png Binary files differnew file mode 100644 index 000000000..cc981d347 --- /dev/null +++ b/res/images/icon_installing_overlay17.png diff --git a/res/images/icon_installing_overlay18.png b/res/images/icon_installing_overlay18.png Binary files differnew file mode 100644 index 000000000..2b3221444 --- /dev/null +++ b/res/images/icon_installing_overlay18.png diff --git a/res/images/icon_installing_overlay19.png b/res/images/icon_installing_overlay19.png Binary files differnew file mode 100644 index 000000000..d379e51a1 --- /dev/null +++ b/res/images/icon_installing_overlay19.png diff --git a/res/images/icon_installing_overlay20.png b/res/images/icon_installing_overlay20.png Binary files differnew file mode 100644 index 000000000..362a8cabc --- /dev/null +++ b/res/images/icon_installing_overlay20.png diff --git a/res/images/icon_installing_overlay21.png b/res/images/icon_installing_overlay21.png Binary files differnew file mode 100644 index 000000000..0b6559222 --- /dev/null +++ b/res/images/icon_installing_overlay21.png diff --git a/res/images/icon_installing_overlay22.png b/res/images/icon_installing_overlay22.png Binary files differnew file mode 100644 index 000000000..51d5cbadf --- /dev/null +++ b/res/images/icon_installing_overlay22.png diff --git a/res/images/icon_installing_overlay23.png b/res/images/icon_installing_overlay23.png Binary files differnew file mode 100644 index 000000000..59148e5cc --- /dev/null +++ b/res/images/icon_installing_overlay23.png diff --git a/res/images/icon_installing_overlay24.png b/res/images/icon_installing_overlay24.png Binary files differnew file mode 100644 index 000000000..d315673b4 --- /dev/null +++ b/res/images/icon_installing_overlay24.png diff --git a/res/images/icon_installing_overlay25.png b/res/images/icon_installing_overlay25.png Binary files differnew file mode 100644 index 000000000..1eb7843e3 --- /dev/null +++ b/res/images/icon_installing_overlay25.png diff --git a/res/images/icon_installing_overlay26.png b/res/images/icon_installing_overlay26.png Binary files differnew file mode 100644 index 000000000..14a024dcf --- /dev/null +++ b/res/images/icon_installing_overlay26.png diff --git a/res/images/icon_installing_overlay27.png b/res/images/icon_installing_overlay27.png Binary files differnew file mode 100644 index 000000000..035c16340 --- /dev/null +++ b/res/images/icon_installing_overlay27.png diff --git a/res/images/icon_installing_overlay28.png b/res/images/icon_installing_overlay28.png Binary files differnew file mode 100644 index 000000000..75483864f --- /dev/null +++ b/res/images/icon_installing_overlay28.png diff --git a/res/images/icon_installing_overlay29.png b/res/images/icon_installing_overlay29.png Binary files differnew file mode 100644 index 000000000..836d3138f --- /dev/null +++ b/res/images/icon_installing_overlay29.png diff --git a/res/images/icon_installing_overlay30.png b/res/images/icon_installing_overlay30.png Binary files differnew file mode 100644 index 000000000..e470a7e1e --- /dev/null +++ b/res/images/icon_installing_overlay30.png diff --git a/res/images/icon_installing_overlay31.png b/res/images/icon_installing_overlay31.png Binary files differnew file mode 100644 index 000000000..bed0c65aa --- /dev/null +++ b/res/images/icon_installing_overlay31.png diff --git a/res/images/icon_installing_overlay32.png b/res/images/icon_installing_overlay32.png Binary files differnew file mode 100644 index 000000000..51811e0ac --- /dev/null +++ b/res/images/icon_installing_overlay32.png diff --git a/res/images/icon_installing_overlay33.png b/res/images/icon_installing_overlay33.png Binary files differnew file mode 100644 index 000000000..f1fc656d5 --- /dev/null +++ b/res/images/icon_installing_overlay33.png diff --git a/res/images/icon_installing_overlay34.png b/res/images/icon_installing_overlay34.png Binary files differnew file mode 100644 index 000000000..5791a7d16 --- /dev/null +++ b/res/images/icon_installing_overlay34.png diff --git a/res/images/icon_installing_overlay35.png b/res/images/icon_installing_overlay35.png Binary files differnew file mode 100644 index 000000000..0769ec9eb --- /dev/null +++ b/res/images/icon_installing_overlay35.png diff --git a/res/images/icon_installing_overlay36.png b/res/images/icon_installing_overlay36.png Binary files differnew file mode 100644 index 000000000..28a692bd2 --- /dev/null +++ b/res/images/icon_installing_overlay36.png diff --git a/res/images/icon_installing_overlay37.png b/res/images/icon_installing_overlay37.png Binary files differnew file mode 100644 index 000000000..12b21cfae --- /dev/null +++ b/res/images/icon_installing_overlay37.png diff --git a/res/images/icon_installing_overlay38.png b/res/images/icon_installing_overlay38.png Binary files differnew file mode 100644 index 000000000..f8ef9967d --- /dev/null +++ b/res/images/icon_installing_overlay38.png diff --git a/res/images/icon_installing_overlay39.png b/res/images/icon_installing_overlay39.png Binary files differnew file mode 100644 index 000000000..f929119ab --- /dev/null +++ b/res/images/icon_installing_overlay39.png diff --git a/res/images/icon_installing_overlay40.png b/res/images/icon_installing_overlay40.png Binary files differnew file mode 100644 index 000000000..ceed45759 --- /dev/null +++ b/res/images/icon_installing_overlay40.png diff --git a/res/images/icon_installing_overlay41.png b/res/images/icon_installing_overlay41.png Binary files differnew file mode 100644 index 000000000..34cf1aec4 --- /dev/null +++ b/res/images/icon_installing_overlay41.png diff --git a/res/images/icon_installing_overlay42.png b/res/images/icon_installing_overlay42.png Binary files differnew file mode 100644 index 000000000..d622417ac --- /dev/null +++ b/res/images/icon_installing_overlay42.png diff --git a/res/images/icon_installing_overlay43.png b/res/images/icon_installing_overlay43.png Binary files differnew file mode 100644 index 000000000..9902df1a7 --- /dev/null +++ b/res/images/icon_installing_overlay43.png diff --git a/res/images/icon_installing_overlay44.png b/res/images/icon_installing_overlay44.png Binary files differnew file mode 100644 index 000000000..b5d7911e1 --- /dev/null +++ b/res/images/icon_installing_overlay44.png diff --git a/res/images/icon_installing_overlay45.png b/res/images/icon_installing_overlay45.png Binary files differnew file mode 100644 index 000000000..dfbf408b6 --- /dev/null +++ b/res/images/icon_installing_overlay45.png diff --git a/res/images/icon_installing_overlay46.png b/res/images/icon_installing_overlay46.png Binary files differnew file mode 100644 index 000000000..495bb90df --- /dev/null +++ b/res/images/icon_installing_overlay46.png diff --git a/res/images/icon_installing_overlay47.png b/res/images/icon_installing_overlay47.png Binary files differnew file mode 100644 index 000000000..9d6937866 --- /dev/null +++ b/res/images/icon_installing_overlay47.png diff --git a/res/images/icon_installing_overlay48.png b/res/images/icon_installing_overlay48.png Binary files differnew file mode 100644 index 000000000..a5080af97 --- /dev/null +++ b/res/images/icon_installing_overlay48.png diff --git a/res/images/indeterminate01.png b/res/images/indeterminate01.png Binary files differindex 933528d6d..4db384337 100644 --- a/res/images/indeterminate01.png +++ b/res/images/indeterminate01.png diff --git a/res/images/indeterminate02.png b/res/images/indeterminate02.png Binary files differindex d760e2bdd..761b2332f 100644 --- a/res/images/indeterminate02.png +++ b/res/images/indeterminate02.png diff --git a/res/images/indeterminate03.png b/res/images/indeterminate03.png Binary files differindex 0e97399d1..e2617abcb 100644 --- a/res/images/indeterminate03.png +++ b/res/images/indeterminate03.png diff --git a/res/images/indeterminate04.png b/res/images/indeterminate04.png Binary files differindex c7d5b4e04..132940e50 100644 --- a/res/images/indeterminate04.png +++ b/res/images/indeterminate04.png diff --git a/res/images/indeterminate05.png b/res/images/indeterminate05.png Binary files differindex d6fb2a032..a17032c2d 100644 --- a/res/images/indeterminate05.png +++ b/res/images/indeterminate05.png diff --git a/res/images/indeterminate06.png b/res/images/indeterminate06.png Binary files differindex 44867619f..efaac42e6 100644 --- a/res/images/indeterminate06.png +++ b/res/images/indeterminate06.png diff --git a/res/images/indeterminate07.png b/res/images/indeterminate07.png Binary files differnew file mode 100644 index 000000000..6e84a5a0f --- /dev/null +++ b/res/images/indeterminate07.png diff --git a/res/images/indeterminate08.png b/res/images/indeterminate08.png Binary files differnew file mode 100644 index 000000000..58c112e38 --- /dev/null +++ b/res/images/indeterminate08.png diff --git a/res/images/indeterminate09.png b/res/images/indeterminate09.png Binary files differnew file mode 100644 index 000000000..b25145f12 --- /dev/null +++ b/res/images/indeterminate09.png diff --git a/res/images/indeterminate10.png b/res/images/indeterminate10.png Binary files differnew file mode 100644 index 000000000..4ff7e2527 --- /dev/null +++ b/res/images/indeterminate10.png diff --git a/res/images/indeterminate11.png b/res/images/indeterminate11.png Binary files differnew file mode 100644 index 000000000..4860c2a02 --- /dev/null +++ b/res/images/indeterminate11.png diff --git a/res/images/indeterminate12.png b/res/images/indeterminate12.png Binary files differnew file mode 100644 index 000000000..a249c225b --- /dev/null +++ b/res/images/indeterminate12.png diff --git a/res/images/indeterminate13.png b/res/images/indeterminate13.png Binary files differnew file mode 100644 index 000000000..1b70dc072 --- /dev/null +++ b/res/images/indeterminate13.png diff --git a/res/images/indeterminate14.png b/res/images/indeterminate14.png Binary files differnew file mode 100644 index 000000000..a5f779f73 --- /dev/null +++ b/res/images/indeterminate14.png diff --git a/res/images/indeterminate15.png b/res/images/indeterminate15.png Binary files differnew file mode 100644 index 000000000..018fa685c --- /dev/null +++ b/res/images/indeterminate15.png diff --git a/res/images/indeterminate16.png b/res/images/indeterminate16.png Binary files differnew file mode 100644 index 000000000..e8e05b6d3 --- /dev/null +++ b/res/images/indeterminate16.png 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; } |
