summaryrefslogtreecommitdiffstats
path: root/screen_ui.h
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-06-28 00:29:33 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-06-28 00:29:36 +0200
commitd6fb1c6367e2d08419b452ed3943f9950476cb88 (patch)
tree5b83ac7c898bbcdb5fa429401281bbe55c28df87 /screen_ui.h
parentMerge "Formatting RecoveryUI related files." (diff)
parentAdd override specifier and member constness to RecoveryUI classes. (diff)
downloadandroid_bootable_recovery-d6fb1c6367e2d08419b452ed3943f9950476cb88.tar
android_bootable_recovery-d6fb1c6367e2d08419b452ed3943f9950476cb88.tar.gz
android_bootable_recovery-d6fb1c6367e2d08419b452ed3943f9950476cb88.tar.bz2
android_bootable_recovery-d6fb1c6367e2d08419b452ed3943f9950476cb88.tar.lz
android_bootable_recovery-d6fb1c6367e2d08419b452ed3943f9950476cb88.tar.xz
android_bootable_recovery-d6fb1c6367e2d08419b452ed3943f9950476cb88.tar.zst
android_bootable_recovery-d6fb1c6367e2d08419b452ed3943f9950476cb88.zip
Diffstat (limited to 'screen_ui.h')
-rw-r--r--screen_ui.h33
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;