diff options
author | Tao Bao <tbao@google.com> | 2015-12-11 15:18:51 -0800 |
---|---|---|
committer | Tao Bao <tbao@google.com> | 2015-12-16 11:35:52 -0800 |
commit | b723f4f38f53a38502abb1a63165ac0749bc9cd9 (patch) | |
tree | c311d658de7ac03080583b24e9157cc6f502f1b4 /screen_ui.h | |
parent | 4e72d1a81e2194caf101dc8633858efaa9bdb39b (diff) | |
download | android_bootable_recovery-b723f4f38f53a38502abb1a63165ac0749bc9cd9.tar.gz android_bootable_recovery-b723f4f38f53a38502abb1a63165ac0749bc9cd9.tar.bz2 android_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.h | 4 |
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 { pthread_t progress_thread_; + // The following two are parsed from the image file + // (e.g. '/res/images/icon_installing.png'). int animation_fps; int installing_frames; @@ -135,7 +137,7 @@ class ScreenRecoveryUI : public RecoveryUI { void DrawTextLines(int* y, const char* const* lines); void LoadBitmap(const char* filename, GRSurface** surface); - void LoadBitmapArray(const char* filename, int* frames, GRSurface*** surface); + void LoadBitmapArray(const char* filename, int* frames, int* fps, GRSurface*** surface); void LoadLocalizedBitmap(const char* filename, GRSurface** surface); }; |