summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlain Vongsouvanh <alainv@google.com>2016-06-07 19:05:29 +0200
committerAlain Vongsouvanh <alainv@google.com>2016-06-07 19:05:29 +0200
commit5b00110e3d6c4af97cd7699a5c61fab2f973107e (patch)
tree1e4f7ca0940723d085f6432571d7fd5a8d7cfdb9
parentresolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 (diff)
downloadandroid_bootable_recovery-5b00110e3d6c4af97cd7699a5c61fab2f973107e.tar
android_bootable_recovery-5b00110e3d6c4af97cd7699a5c61fab2f973107e.tar.gz
android_bootable_recovery-5b00110e3d6c4af97cd7699a5c61fab2f973107e.tar.bz2
android_bootable_recovery-5b00110e3d6c4af97cd7699a5c61fab2f973107e.tar.lz
android_bootable_recovery-5b00110e3d6c4af97cd7699a5c61fab2f973107e.tar.xz
android_bootable_recovery-5b00110e3d6c4af97cd7699a5c61fab2f973107e.tar.zst
android_bootable_recovery-5b00110e3d6c4af97cd7699a5c61fab2f973107e.zip
Diffstat (limited to '')
-rw-r--r--wear_ui.cpp2
-rw-r--r--wear_ui.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 55b7afc8f..ebe0dfe37 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -288,7 +288,7 @@ void WearRecoveryUI::progress_loop() {
if ((currentIcon == INSTALLING_UPDATE || currentIcon == ERASING)
&& !show_text) {
if (!intro_done) {
- if (current_frame == intro_frames - 1) {
+ if (current_frame >= intro_frames - 1) {
intro_done = true;
current_frame = 0;
} else {
diff --git a/wear_ui.h b/wear_ui.h
index 839a26438..259a63ee7 100644
--- a/wear_ui.h
+++ b/wear_ui.h
@@ -79,6 +79,9 @@ class WearRecoveryUI : public RecoveryUI {
int intro_frames;
int loop_frames;
+ // animation's fps (default: 30)
+ int animation_fps;
+
private:
Icon currentIcon;
@@ -86,8 +89,6 @@ class WearRecoveryUI : public RecoveryUI {
int current_frame;
- int animation_fps;
-
bool rtl_locale;
pthread_mutex_t updateMutex;