recovery: Make wear recovery more customizable.

Making animation_fps protected and adding support for 0 frames intro.

BUG: 29085786
Change-Id: I07b44570022bad89661973178d453592c01f3f10
This commit is contained in:
Alain Vongsouvanh 2016-06-07 10:05:29 -07:00
parent fc1d9a49d1
commit 5b00110e3d
2 changed files with 4 additions and 3 deletions

View file

@ -288,7 +288,7 @@ void WearRecoveryUI::progress_loop() {
if ((currentIcon == INSTALLING_UPDATE || currentIcon == ERASING) if ((currentIcon == INSTALLING_UPDATE || currentIcon == ERASING)
&& !show_text) { && !show_text) {
if (!intro_done) { if (!intro_done) {
if (current_frame == intro_frames - 1) { if (current_frame >= intro_frames - 1) {
intro_done = true; intro_done = true;
current_frame = 0; current_frame = 0;
} else { } else {

View file

@ -79,6 +79,9 @@ class WearRecoveryUI : public RecoveryUI {
int intro_frames; int intro_frames;
int loop_frames; int loop_frames;
// animation's fps (default: 30)
int animation_fps;
private: private:
Icon currentIcon; Icon currentIcon;
@ -86,8 +89,6 @@ class WearRecoveryUI : public RecoveryUI {
int current_frame; int current_frame;
int animation_fps;
bool rtl_locale; bool rtl_locale;
pthread_mutex_t updateMutex; pthread_mutex_t updateMutex;