diff options
author | Tao Bao <tbao@google.com> | 2017-06-28 00:38:34 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-28 00:38:34 +0200 |
commit | 57191920e891b8f4cd288fb8f644e5cd637224f0 (patch) | |
tree | 38b49083418d49d5cba1f5fbbb12920d3e44c58f /screen_ui.h | |
parent | Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6 (diff) | |
parent | Merge "Add override specifier and member constness to RecoveryUI classes." (diff) | |
download | android_bootable_recovery-57191920e891b8f4cd288fb8f644e5cd637224f0.tar android_bootable_recovery-57191920e891b8f4cd288fb8f644e5cd637224f0.tar.gz android_bootable_recovery-57191920e891b8f4cd288fb8f644e5cd637224f0.tar.bz2 android_bootable_recovery-57191920e891b8f4cd288fb8f644e5cd637224f0.tar.lz android_bootable_recovery-57191920e891b8f4cd288fb8f644e5cd637224f0.tar.xz android_bootable_recovery-57191920e891b8f4cd288fb8f644e5cd637224f0.tar.zst android_bootable_recovery-57191920e891b8f4cd288fb8f644e5cd637224f0.zip |
Diffstat (limited to 'screen_ui.h')
-rw-r--r-- | screen_ui.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/screen_ui.h b/screen_ui.h index 2a3d8c30b..e8d3c3222 100644 --- a/screen_ui.h +++ b/screen_ui.h @@ -36,8 +36,8 @@ class ScreenRecoveryUI : public RecoveryUI { bool Init(const std::string& locale) override; // overall recovery state ("background image") - void SetBackground(Icon icon); - void SetSystemUpdateText(bool security_update); + void SetBackground(Icon icon) override; + void SetSystemUpdateText(bool security_update) override; // progress indicator void SetProgressType(ProgressType type) override; @@ -52,16 +52,17 @@ class ScreenRecoveryUI : public RecoveryUI { bool WasTextEverVisible() override; // printing messages - void Print(const char* fmt, ...) __printflike(2, 3); - void PrintOnScreenOnly(const char* fmt, ...) __printflike(2, 3); - void ShowFile(const char* filename); + void Print(const char* fmt, ...) override __printflike(2, 3); + void PrintOnScreenOnly(const char* fmt, ...) override __printflike(2, 3); + void ShowFile(const char* filename) override; // menu display - void StartMenu(const char* const* headers, const char* const* items, int initial_selection); - int SelectMenu(int sel); - void EndMenu(); + void StartMenu(const char* const* headers, const char* const* items, + int initial_selection) override; + int SelectMenu(int sel) override; + void EndMenu() override; - void KeyLongPress(int); + void KeyLongPress(int) override; void Redraw(); @@ -75,7 +76,7 @@ class ScreenRecoveryUI : public RecoveryUI { TEXT_FILL, INFO }; - void SetColor(UIElement e); + void SetColor(UIElement e) const; protected: // The margin that we don't want to use for showing texts (e.g. round screen, or screen with @@ -158,8 +159,8 @@ class ScreenRecoveryUI : public RecoveryUI { virtual void update_screen_locked(); virtual void update_progress_locked(); - GRSurface* GetCurrentFrame(); - GRSurface* GetCurrentText(); + GRSurface* GetCurrentFrame() const; + GRSurface* GetCurrentText() const; static void* ProgressThreadStartRoutine(void* data); void ProgressThreadLoop(); @@ -174,11 +175,11 @@ class ScreenRecoveryUI : public RecoveryUI { void LoadLocalizedBitmap(const char* filename, GRSurface** surface); int PixelsFromDp(int dp) const; - virtual int GetAnimationBaseline(); - virtual int GetProgressBaseline(); - virtual int GetTextBaseline(); + virtual int GetAnimationBaseline() const; + virtual int GetProgressBaseline() const; + virtual int GetTextBaseline() const; - virtual void DrawHorizontalRule(int* y); + virtual void DrawHorizontalRule(int* y) const; virtual void DrawHighlightBar(int x, int y, int width, int height) const; virtual void DrawTextLine(int x, int* y, const char* line, bool bold) const; void DrawTextLines(int x, int* y, const char* const* lines) const; |