diff options
author | Elliott Hughes <enh@google.com> | 2016-04-28 02:44:24 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-04-28 02:44:24 +0200 |
commit | 21092a98235d98f431c88ac5f4369ab1ccf0ae9f (patch) | |
tree | 2f19d0c1f918ce089701a3cb54c970626cf5f70f /screen_ui.h | |
parent | Merge "Import translations. DO NOT MERGE" into nyc-dev (diff) | |
parent | Merge "Update recovery UI." into nyc-dev (diff) | |
download | android_bootable_recovery-21092a98235d98f431c88ac5f4369ab1ccf0ae9f.tar android_bootable_recovery-21092a98235d98f431c88ac5f4369ab1ccf0ae9f.tar.gz android_bootable_recovery-21092a98235d98f431c88ac5f4369ab1ccf0ae9f.tar.bz2 android_bootable_recovery-21092a98235d98f431c88ac5f4369ab1ccf0ae9f.tar.lz android_bootable_recovery-21092a98235d98f431c88ac5f4369ab1ccf0ae9f.tar.xz android_bootable_recovery-21092a98235d98f431c88ac5f4369ab1ccf0ae9f.tar.zst android_bootable_recovery-21092a98235d98f431c88ac5f4369ab1ccf0ae9f.zip |
Diffstat (limited to 'screen_ui.h')
-rw-r--r-- | screen_ui.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/screen_ui.h b/screen_ui.h index 233ff55e6..d8ac85bea 100644 --- a/screen_ui.h +++ b/screen_ui.h @@ -74,6 +74,11 @@ class ScreenRecoveryUI : public RecoveryUI { bool intro_done; int current_frame; + // The scale factor from dp to pixels. 1.0 for mdpi, 4.0 for xxxhdpi. + float density_; + // True if we should use the large layout. + bool is_large_; + GRSurface* error_icon; GRSurface* erasing_text; @@ -123,8 +128,6 @@ class ScreenRecoveryUI : public RecoveryUI { // Number of frames per sec (default: 30) for both parts of the animation. int animation_fps; - int iconX, iconY; - int stage, max_stage; int char_width_; @@ -133,7 +136,7 @@ class ScreenRecoveryUI : public RecoveryUI { bool rtl_locale; void draw_background_locked(); - void draw_progress_locked(); + void draw_foreground_locked(); void draw_screen_locked(); void update_screen_locked(); void update_progress_locked(); @@ -153,6 +156,11 @@ class ScreenRecoveryUI : public RecoveryUI { void LoadBitmap(const char* filename, GRSurface** surface); void LoadLocalizedBitmap(const char* filename, GRSurface** surface); + int PixelsFromDp(int dp); + int GetAnimationBaseline(); + int GetProgressBaseline(); + int GetTextBaseline(); + void DrawHorizontalRule(int* y); void DrawTextLine(int x, int* y, const char* line, bool bold); void DrawTextLines(int x, int* y, const char* const* lines); |