diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-05-03 04:12:48 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-03 04:12:48 +0200 |
commit | b4ded4a6ced2010b04ae6fa03ae27c2621bfab38 (patch) | |
tree | 71f8596358d2b86e4406f21c8dbe58b90cad96fb /screen_ui.h | |
parent | Merge "screen_ui: Drop the dependency on common.h." (diff) | |
parent | screen_ui: Use std::string in DrawTextLine() and siblings. (diff) | |
download | android_bootable_recovery-b4ded4a6ced2010b04ae6fa03ae27c2621bfab38.tar android_bootable_recovery-b4ded4a6ced2010b04ae6fa03ae27c2621bfab38.tar.gz android_bootable_recovery-b4ded4a6ced2010b04ae6fa03ae27c2621bfab38.tar.bz2 android_bootable_recovery-b4ded4a6ced2010b04ae6fa03ae27c2621bfab38.tar.lz android_bootable_recovery-b4ded4a6ced2010b04ae6fa03ae27c2621bfab38.tar.xz android_bootable_recovery-b4ded4a6ced2010b04ae6fa03ae27c2621bfab38.tar.zst android_bootable_recovery-b4ded4a6ced2010b04ae6fa03ae27c2621bfab38.zip |
Diffstat (limited to 'screen_ui.h')
-rw-r--r-- | screen_ui.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/screen_ui.h b/screen_ui.h index 986959c69..b0cbbdb90 100644 --- a/screen_ui.h +++ b/screen_ui.h @@ -178,7 +178,7 @@ class ScreenRecoveryUI : public RecoveryUI { virtual void draw_background_locked(); virtual void draw_foreground_locked(); virtual void draw_screen_locked(); - virtual void draw_menu_and_text_buffer_locked(const char* const* help_message); + virtual void draw_menu_and_text_buffer_locked(const std::vector<std::string>& help_message); virtual void update_screen_locked(); virtual void update_progress_locked(); @@ -212,7 +212,7 @@ class ScreenRecoveryUI : public RecoveryUI { // Draws a horizontal rule at Y. Returns the offset it should be moving along Y-axis. virtual int DrawHorizontalRule(int y) const; // Draws a line of text. Returns the offset it should be moving along Y-axis. - virtual int DrawTextLine(int x, int y, const char* line, bool bold) const; + virtual int DrawTextLine(int x, int y, const std::string& line, bool bold) const; // Draws surface portion (sx, sy, w, h) at screen location (dx, dy). virtual void DrawSurface(GRSurface* surface, int sx, int sy, int w, int h, int dx, int dy) const; // Draws rectangle at (x, y) - (x + w, y + h). @@ -220,10 +220,10 @@ class ScreenRecoveryUI : public RecoveryUI { // Draws given surface (surface->pixel_bytes = 1) as text at (x, y). virtual void DrawTextIcon(int x, int y, GRSurface* surface) const; // Draws multiple text lines. Returns the offset it should be moving along Y-axis. - int DrawTextLines(int x, int y, const char* const* lines) const; + int DrawTextLines(int x, int y, const std::vector<std::string>& lines) const; // Similar to DrawTextLines() to draw multiple text lines, but additionally wraps long lines. // Returns the offset it should be moving along Y-axis. - int DrawWrappedTextLines(int x, int y, const char* const* lines) const; + int DrawWrappedTextLines(int x, int y, const std::vector<std::string>& lines) const; Icon currentIcon; |