commit 6aa6ddb3c584dbf89739465bf2f703d8e1b28c26
author Alain Vongsouvanh <alainv@google.com> Wed Jun 08 15:10:54 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 08 15:10:54 2016 +0000
tree a8dec2532f8f9d7e212f38545672a45afe8304b9
parent b02b2fe392827a423c7783522edc5b9ad3d4f130
parent 5b00110e3d6c4af97cd7699a5c61fab2f973107e

recovery: Make wear recovery more customizable.
am: 5b00110e3d

Change-Id: I88ab75e875cea8813ab4bdc9f099c31609ace6fd

wear_ui.cpp

diff --git a/wear_ui.cpp b/wear_ui.cpp
index 55b7afc..ebe0dfe 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -288,7 +288,7 @@
         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 {

wear_ui.h

diff --git a/wear_ui.h b/wear_ui.h
index 839a264..259a63e 100644
--- a/wear_ui.h
+++ b/wear_ui.h
@@ -79,6 +79,9 @@
     int intro_frames;
     int loop_frames;
 
+    // animation's fps (default: 30)
+    int animation_fps;
+
   private:
     Icon currentIcon;
 
@@ -86,8 +89,6 @@
 
     int current_frame;
 
-    int animation_fps;
-
     bool rtl_locale;
 
     pthread_mutex_t updateMutex;