aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2015-12-11 17:18:51 -0600
committerTao Bao2015-12-16 13:35:52 -0600
commitb723f4f38f53a38502abb1a63165ac0749bc9cd9 (patch)
treec311d658de7ac03080583b24e9157cc6f502f1b4 /screen_ui.h
parent4e72d1a81e2194caf101dc8633858efaa9bdb39b (diff)
downloadplatform-bootable-recovery-b723f4f38f53a38502abb1a63165ac0749bc9cd9.tar.gz
platform-bootable-recovery-b723f4f38f53a38502abb1a63165ac0749bc9cd9.tar.xz
platform-bootable-recovery-b723f4f38f53a38502abb1a63165ac0749bc9cd9.zip
res: Embed FPS into icon_installing.png.
We allow vendor-specific icon installing image but have defined private animation_fps that can't be overridden. This CL changes the image generator to optionally embed FPS (otherwise use the default value of 20) into the generated image. For wear devices, they are using individual images instead of the interlaced one. Change the animation_fps from private to protected so that it can be customized. Bug: 26009230 Change-Id: I9fbf64ec717029d4c54f72316f6cb079e8dbfb5e
Diffstat (limited to 'screen_ui.h')
-rw-r--r--screen_ui.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/screen_ui.h b/screen_ui.h
index 8e18864d..08a5f44a 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -109,6 +109,8 @@ class ScreenRecoveryUI : public RecoveryUI {
109 109
110 pthread_t progress_thread_; 110 pthread_t progress_thread_;
111 111
112 // The following two are parsed from the image file
113 // (e.g. '/res/images/icon_installing.png').
112 int animation_fps; 114 int animation_fps;
113 int installing_frames; 115 int installing_frames;
114 116
@@ -135,7 +137,7 @@ class ScreenRecoveryUI : public RecoveryUI {
135 void DrawTextLines(int* y, const char* const* lines); 137 void DrawTextLines(int* y, const char* const* lines);
136 138
137 void LoadBitmap(const char* filename, GRSurface** surface); 139 void LoadBitmap(const char* filename, GRSurface** surface);
138 void LoadBitmapArray(const char* filename, int* frames, GRSurface*** surface); 140 void LoadBitmapArray(const char* filename, int* frames, int* fps, GRSurface*** surface);
139 void LoadLocalizedBitmap(const char* filename, GRSurface** surface); 141 void LoadLocalizedBitmap(const char* filename, GRSurface** surface);
140}; 142};
141 143