diff options
| author | Doug Zongker <dougz@google.com> | 2012-10-08 19:57:16 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-08 19:57:16 +0200 |
| commit | 2e883a8deb6a6ade1d0c5439f186673a46918471 (patch) | |
| tree | e53e6deaab753b1e7430d072e2fde63d44a43936 | |
| parent | am 6cc3ded2: (-s ours) Reconcile with jb-mr1-release - do not merge (diff) | |
| parent | am 8347cb2d: revert to tacky 3D recovery animation (diff) | |
| download | android_bootable_recovery-2e883a8deb6a6ade1d0c5439f186673a46918471.tar android_bootable_recovery-2e883a8deb6a6ade1d0c5439f186673a46918471.tar.gz android_bootable_recovery-2e883a8deb6a6ade1d0c5439f186673a46918471.tar.bz2 android_bootable_recovery-2e883a8deb6a6ade1d0c5439f186673a46918471.tar.lz android_bootable_recovery-2e883a8deb6a6ade1d0c5439f186673a46918471.tar.xz android_bootable_recovery-2e883a8deb6a6ade1d0c5439f186673a46918471.tar.zst android_bootable_recovery-2e883a8deb6a6ade1d0c5439f186673a46918471.zip | |
67 files changed, 4 insertions, 4 deletions
diff --git a/res/images/icon_error.png b/res/images/icon_error.png Binary files differindex 7000d4d8a..cb3d1ab22 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 ad7927753..571eb8b0f 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 c9f6125d9..e762d6cbe 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 c87e5fa92..f7a853017 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 30e95803f..1a1d738e4 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 6f1f9cf0d..a74903d33 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 8791abdbd..d17bdc006 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 08a0133b0..1200b75cb 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 15b53d9b7..3838a85ad 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 differdeleted file mode 100644 index bb4987894..000000000 --- a/res/images/icon_installing_overlay08.png +++ /dev/null diff --git a/res/images/icon_installing_overlay09.png b/res/images/icon_installing_overlay09.png Binary files differdeleted file mode 100644 index e8715fcfa..000000000 --- a/res/images/icon_installing_overlay09.png +++ /dev/null diff --git a/res/images/icon_installing_overlay10.png b/res/images/icon_installing_overlay10.png Binary files differdeleted file mode 100644 index 4ad81bf71..000000000 --- a/res/images/icon_installing_overlay10.png +++ /dev/null diff --git a/res/images/icon_installing_overlay11.png b/res/images/icon_installing_overlay11.png Binary files differdeleted file mode 100644 index b3ae7e3ad..000000000 --- a/res/images/icon_installing_overlay11.png +++ /dev/null diff --git a/res/images/icon_installing_overlay12.png b/res/images/icon_installing_overlay12.png Binary files differdeleted file mode 100644 index 5e7fd04a6..000000000 --- a/res/images/icon_installing_overlay12.png +++ /dev/null diff --git a/res/images/icon_installing_overlay13.png b/res/images/icon_installing_overlay13.png Binary files differdeleted file mode 100644 index 4e4dbe923..000000000 --- a/res/images/icon_installing_overlay13.png +++ /dev/null diff --git a/res/images/icon_installing_overlay14.png b/res/images/icon_installing_overlay14.png Binary files differdeleted file mode 100644 index 55e19b5e4..000000000 --- a/res/images/icon_installing_overlay14.png +++ /dev/null diff --git a/res/images/icon_installing_overlay15.png b/res/images/icon_installing_overlay15.png Binary files differdeleted file mode 100644 index ac5fb991c..000000000 --- a/res/images/icon_installing_overlay15.png +++ /dev/null diff --git a/res/images/icon_installing_overlay16.png b/res/images/icon_installing_overlay16.png Binary files differdeleted file mode 100644 index 6461d70f1..000000000 --- a/res/images/icon_installing_overlay16.png +++ /dev/null diff --git a/res/images/icon_installing_overlay17.png b/res/images/icon_installing_overlay17.png Binary files differdeleted file mode 100644 index cc981d347..000000000 --- a/res/images/icon_installing_overlay17.png +++ /dev/null diff --git a/res/images/icon_installing_overlay18.png b/res/images/icon_installing_overlay18.png Binary files differdeleted file mode 100644 index 2b3221444..000000000 --- a/res/images/icon_installing_overlay18.png +++ /dev/null diff --git a/res/images/icon_installing_overlay19.png b/res/images/icon_installing_overlay19.png Binary files differdeleted file mode 100644 index d379e51a1..000000000 --- a/res/images/icon_installing_overlay19.png +++ /dev/null diff --git a/res/images/icon_installing_overlay20.png b/res/images/icon_installing_overlay20.png Binary files differdeleted file mode 100644 index 362a8cabc..000000000 --- a/res/images/icon_installing_overlay20.png +++ /dev/null diff --git a/res/images/icon_installing_overlay21.png b/res/images/icon_installing_overlay21.png Binary files differdeleted file mode 100644 index 0b6559222..000000000 --- a/res/images/icon_installing_overlay21.png +++ /dev/null diff --git a/res/images/icon_installing_overlay22.png b/res/images/icon_installing_overlay22.png Binary files differdeleted file mode 100644 index 51d5cbadf..000000000 --- a/res/images/icon_installing_overlay22.png +++ /dev/null diff --git a/res/images/icon_installing_overlay23.png b/res/images/icon_installing_overlay23.png Binary files differdeleted file mode 100644 index 59148e5cc..000000000 --- a/res/images/icon_installing_overlay23.png +++ /dev/null diff --git a/res/images/icon_installing_overlay24.png b/res/images/icon_installing_overlay24.png Binary files differdeleted file mode 100644 index d315673b4..000000000 --- a/res/images/icon_installing_overlay24.png +++ /dev/null diff --git a/res/images/icon_installing_overlay25.png b/res/images/icon_installing_overlay25.png Binary files differdeleted file mode 100644 index 1eb7843e3..000000000 --- a/res/images/icon_installing_overlay25.png +++ /dev/null diff --git a/res/images/icon_installing_overlay26.png b/res/images/icon_installing_overlay26.png Binary files differdeleted file mode 100644 index 14a024dcf..000000000 --- a/res/images/icon_installing_overlay26.png +++ /dev/null diff --git a/res/images/icon_installing_overlay27.png b/res/images/icon_installing_overlay27.png Binary files differdeleted file mode 100644 index 035c16340..000000000 --- a/res/images/icon_installing_overlay27.png +++ /dev/null diff --git a/res/images/icon_installing_overlay28.png b/res/images/icon_installing_overlay28.png Binary files differdeleted file mode 100644 index 75483864f..000000000 --- a/res/images/icon_installing_overlay28.png +++ /dev/null diff --git a/res/images/icon_installing_overlay29.png b/res/images/icon_installing_overlay29.png Binary files differdeleted file mode 100644 index 836d3138f..000000000 --- a/res/images/icon_installing_overlay29.png +++ /dev/null diff --git a/res/images/icon_installing_overlay30.png b/res/images/icon_installing_overlay30.png Binary files differdeleted file mode 100644 index e470a7e1e..000000000 --- a/res/images/icon_installing_overlay30.png +++ /dev/null diff --git a/res/images/icon_installing_overlay31.png b/res/images/icon_installing_overlay31.png Binary files differdeleted file mode 100644 index bed0c65aa..000000000 --- a/res/images/icon_installing_overlay31.png +++ /dev/null diff --git a/res/images/icon_installing_overlay32.png b/res/images/icon_installing_overlay32.png Binary files differdeleted file mode 100644 index 51811e0ac..000000000 --- a/res/images/icon_installing_overlay32.png +++ /dev/null diff --git a/res/images/icon_installing_overlay33.png b/res/images/icon_installing_overlay33.png Binary files differdeleted file mode 100644 index f1fc656d5..000000000 --- a/res/images/icon_installing_overlay33.png +++ /dev/null diff --git a/res/images/icon_installing_overlay34.png b/res/images/icon_installing_overlay34.png Binary files differdeleted file mode 100644 index 5791a7d16..000000000 --- a/res/images/icon_installing_overlay34.png +++ /dev/null diff --git a/res/images/icon_installing_overlay35.png b/res/images/icon_installing_overlay35.png Binary files differdeleted file mode 100644 index 0769ec9eb..000000000 --- a/res/images/icon_installing_overlay35.png +++ /dev/null diff --git a/res/images/icon_installing_overlay36.png b/res/images/icon_installing_overlay36.png Binary files differdeleted file mode 100644 index 28a692bd2..000000000 --- a/res/images/icon_installing_overlay36.png +++ /dev/null diff --git a/res/images/icon_installing_overlay37.png b/res/images/icon_installing_overlay37.png Binary files differdeleted file mode 100644 index 12b21cfae..000000000 --- a/res/images/icon_installing_overlay37.png +++ /dev/null diff --git a/res/images/icon_installing_overlay38.png b/res/images/icon_installing_overlay38.png Binary files differdeleted file mode 100644 index f8ef9967d..000000000 --- a/res/images/icon_installing_overlay38.png +++ /dev/null diff --git a/res/images/icon_installing_overlay39.png b/res/images/icon_installing_overlay39.png Binary files differdeleted file mode 100644 index f929119ab..000000000 --- a/res/images/icon_installing_overlay39.png +++ /dev/null diff --git a/res/images/icon_installing_overlay40.png b/res/images/icon_installing_overlay40.png Binary files differdeleted file mode 100644 index ceed45759..000000000 --- a/res/images/icon_installing_overlay40.png +++ /dev/null diff --git a/res/images/icon_installing_overlay41.png b/res/images/icon_installing_overlay41.png Binary files differdeleted file mode 100644 index 34cf1aec4..000000000 --- a/res/images/icon_installing_overlay41.png +++ /dev/null diff --git a/res/images/icon_installing_overlay42.png b/res/images/icon_installing_overlay42.png Binary files differdeleted file mode 100644 index d622417ac..000000000 --- a/res/images/icon_installing_overlay42.png +++ /dev/null diff --git a/res/images/icon_installing_overlay43.png b/res/images/icon_installing_overlay43.png Binary files differdeleted file mode 100644 index 9902df1a7..000000000 --- a/res/images/icon_installing_overlay43.png +++ /dev/null diff --git a/res/images/icon_installing_overlay44.png b/res/images/icon_installing_overlay44.png Binary files differdeleted file mode 100644 index b5d7911e1..000000000 --- a/res/images/icon_installing_overlay44.png +++ /dev/null diff --git a/res/images/icon_installing_overlay45.png b/res/images/icon_installing_overlay45.png Binary files differdeleted file mode 100644 index dfbf408b6..000000000 --- a/res/images/icon_installing_overlay45.png +++ /dev/null diff --git a/res/images/icon_installing_overlay46.png b/res/images/icon_installing_overlay46.png Binary files differdeleted file mode 100644 index 495bb90df..000000000 --- a/res/images/icon_installing_overlay46.png +++ /dev/null diff --git a/res/images/icon_installing_overlay47.png b/res/images/icon_installing_overlay47.png Binary files differdeleted file mode 100644 index 9d6937866..000000000 --- a/res/images/icon_installing_overlay47.png +++ /dev/null diff --git a/res/images/icon_installing_overlay48.png b/res/images/icon_installing_overlay48.png Binary files differdeleted file mode 100644 index a5080af97..000000000 --- a/res/images/icon_installing_overlay48.png +++ /dev/null diff --git a/res/images/indeterminate01.png b/res/images/indeterminate01.png Binary files differindex 4db384337..933528d6d 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 761b2332f..d760e2bdd 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 e2617abcb..0e97399d1 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 132940e50..c7d5b4e04 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 a17032c2d..d6fb2a032 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 efaac42e6..44867619f 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 differdeleted file mode 100644 index 6e84a5a0f..000000000 --- a/res/images/indeterminate07.png +++ /dev/null diff --git a/res/images/indeterminate08.png b/res/images/indeterminate08.png Binary files differdeleted file mode 100644 index 58c112e38..000000000 --- a/res/images/indeterminate08.png +++ /dev/null diff --git a/res/images/indeterminate09.png b/res/images/indeterminate09.png Binary files differdeleted file mode 100644 index b25145f12..000000000 --- a/res/images/indeterminate09.png +++ /dev/null diff --git a/res/images/indeterminate10.png b/res/images/indeterminate10.png Binary files differdeleted file mode 100644 index 4ff7e2527..000000000 --- a/res/images/indeterminate10.png +++ /dev/null diff --git a/res/images/indeterminate11.png b/res/images/indeterminate11.png Binary files differdeleted file mode 100644 index 4860c2a02..000000000 --- a/res/images/indeterminate11.png +++ /dev/null diff --git a/res/images/indeterminate12.png b/res/images/indeterminate12.png Binary files differdeleted file mode 100644 index a249c225b..000000000 --- a/res/images/indeterminate12.png +++ /dev/null diff --git a/res/images/indeterminate13.png b/res/images/indeterminate13.png Binary files differdeleted file mode 100644 index 1b70dc072..000000000 --- a/res/images/indeterminate13.png +++ /dev/null diff --git a/res/images/indeterminate14.png b/res/images/indeterminate14.png Binary files differdeleted file mode 100644 index a5f779f73..000000000 --- a/res/images/indeterminate14.png +++ /dev/null diff --git a/res/images/indeterminate15.png b/res/images/indeterminate15.png Binary files differdeleted file mode 100644 index 018fa685c..000000000 --- a/res/images/indeterminate15.png +++ /dev/null diff --git a/res/images/indeterminate16.png b/res/images/indeterminate16.png Binary files differdeleted file mode 100644 index e8e05b6d3..000000000 --- a/res/images/indeterminate16.png +++ /dev/null diff --git a/screen_ui.cpp b/screen_ui.cpp index ab7546d40..e36fa3d8f 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -76,10 +76,10 @@ ScreenRecoveryUI::ScreenRecoveryUI() : // that overrides Init() to set these values appropriately and // then call the superclass Init(). animation_fps(20), - indeterminate_frames(16), - installing_frames(48), - install_overlay_offset_x(65), - install_overlay_offset_y(106), + indeterminate_frames(6), + installing_frames(7), + install_overlay_offset_x(13), + install_overlay_offset_y(190), overlay_offset_x(-1), overlay_offset_y(-1) { pthread_mutex_init(&updateMutex, NULL); |
