aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2017-08-22 12:44:16 -0500
committerGerrit Code Review2017-08-22 12:44:16 -0500
commit89ad02206a993f063f2a32782427812ba87f6cb8 (patch)
tree366f8fbdf3193a2635844b1f49d275afc22f89d6 /screen_ui.h
parentb127fddf090aa6c3177d39fdbb4d0e421302c2db (diff)
parenteea3af3f911d36ac1a82a9fb95d24912cc07e3b1 (diff)
downloadplatform-bootable-recovery-89ad02206a993f063f2a32782427812ba87f6cb8.tar.gz
platform-bootable-recovery-89ad02206a993f063f2a32782427812ba87f6cb8.tar.xz
platform-bootable-recovery-89ad02206a993f063f2a32782427812ba87f6cb8.zip
Merge changes I5d7a6baa,Id0fb2d4e
* changes: wear_ui: Expose menu_unusable_rows via Makefile var. Allow customizing WearRecoveryUI via Makefile variables.
Diffstat (limited to 'screen_ui.h')
-rw-r--r--screen_ui.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/screen_ui.h b/screen_ui.h
index df7cc25b..62dda755 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -84,6 +84,9 @@ class ScreenRecoveryUI : public RecoveryUI {
84 const int kMarginWidth; 84 const int kMarginWidth;
85 const int kMarginHeight; 85 const int kMarginHeight;
86 86
87 // Number of frames per sec (default: 30) for both parts of the animation.
88 const int kAnimationFps;
89
87 // The scale factor from dp to pixels. 1.0 for mdpi, 4.0 for xxxhdpi. 90 // The scale factor from dp to pixels. 1.0 for mdpi, 4.0 for xxxhdpi.
88 const float density_; 91 const float density_;
89 92
@@ -141,9 +144,6 @@ class ScreenRecoveryUI : public RecoveryUI {
141 size_t current_frame; 144 size_t current_frame;
142 bool intro_done; 145 bool intro_done;
143 146
144 // Number of frames per sec (default: 30) for both parts of the animation.
145 int animation_fps;
146
147 int stage, max_stage; 147 int stage, max_stage;
148 148
149 int char_width_; 149 int char_width_;