From be6d4d10529860037c165e4441a2d23f539e7b00 Mon Sep 17 00:00:00 2001
From: Doug Zongker <dougz@android.com>
Date: Wed, 2 Mar 2011 10:38:02 -0800
Subject: change the default recovery assets to be in holograph style

Also remove the weird backwards compatibility thing for animations
with fewer than 10 frames.  Frames are always named "name01.png",
"name02.png", ..., no matter how many there are.

Change-Id: I7af64fdec1bfcdb0464998b735ec8d6c626ffe9d
---
 ui.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'ui.c')

diff --git a/ui.c b/ui.c
index 054e53f60..5a2a83715 100644
--- a/ui.c
+++ b/ui.c
@@ -39,10 +39,10 @@
 #define UI_WAIT_KEY_TIMEOUT_SEC    120
 
 UIParameters ui_parameters = {
-    6,     // indeterminate progress bar frames
-    15,    // fps
-    0,     // installation icon frames (0 == static image)
-    0, 0,  // installation icon overlay offset
+    6,       // indeterminate progress bar frames
+    20,      // fps
+    7,       // installation icon frames (0 == static image)
+    23, 83,  // installation icon overlay offset
 };
 
 static pthread_mutex_t gUpdateMutex = PTHREAD_MUTEX_INITIALIZER;
@@ -386,10 +386,8 @@ void ui_init(void)
                                        sizeof(gr_surface));
     for (i = 0; i < ui_parameters.indeterminate_frames; ++i) {
         char filename[40];
-        // "indeterminateN" if fewer than 10 frames, else "indeterminateNN".
-        sprintf(filename, "indeterminate%0*d",
-                ui_parameters.indeterminate_frames < 10 ? 1 : 2,
-                i+1);
+        // "indeterminate01.png", "indeterminate02.png", ...
+        sprintf(filename, "indeterminate%02d", i+1);
         int result = res_create_surface(filename, gProgressBarIndeterminate+i);
         if (result < 0) {
             LOGE("Missing bitmap %s\n(Code %d)\n", filename, result);
@@ -401,9 +399,9 @@ void ui_init(void)
                                       sizeof(gr_surface));
         for (i = 0; i < ui_parameters.installing_frames; ++i) {
             char filename[40];
-            sprintf(filename, "icon_installing_overlay%0*d",
-                    ui_parameters.installing_frames < 10 ? 1 : 2,
-                    i+1);
+            // "icon_installing_overlay01.png",
+            // "icon_installing_overlay02.png", ...
+            sprintf(filename, "icon_installing_overlay%02d", i+1);
             int result = res_create_surface(filename, gInstallationOverlay+i);
             if (result < 0) {
                 LOGE("Missing bitmap %s\n(Code %d)\n", filename, result);
-- 
cgit v1.2.3