diff options
author | Elliott Hughes <enh@google.com> | 2015-04-09 03:03:29 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-09 03:03:29 +0200 |
commit | bab7b2111beecf163f6c51cb42a2675ddf45893d (patch) | |
tree | 58208cc69b57a78a0cc90e81d73c3d8da55f3b7f /screen_ui.h | |
parent | am 72ba6264: am 64346eae: Merge "Remove a couple of unused inlines from minzip/Zip.h." (diff) | |
parent | am 900c9a61: Merge "Remove the fixed screen size assumptions." (diff) | |
download | android_bootable_recovery-bab7b2111beecf163f6c51cb42a2675ddf45893d.tar android_bootable_recovery-bab7b2111beecf163f6c51cb42a2675ddf45893d.tar.gz android_bootable_recovery-bab7b2111beecf163f6c51cb42a2675ddf45893d.tar.bz2 android_bootable_recovery-bab7b2111beecf163f6c51cb42a2675ddf45893d.tar.lz android_bootable_recovery-bab7b2111beecf163f6c51cb42a2675ddf45893d.tar.xz android_bootable_recovery-bab7b2111beecf163f6c51cb42a2675ddf45893d.tar.zst android_bootable_recovery-bab7b2111beecf163f6c51cb42a2675ddf45893d.zip |
Diffstat (limited to 'screen_ui.h')
-rw-r--r-- | screen_ui.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/screen_ui.h b/screen_ui.h index 01a33bfe2..210fd3e17 100644 --- a/screen_ui.h +++ b/screen_ui.h @@ -84,17 +84,14 @@ class ScreenRecoveryUI : public RecoveryUI { // progress bar) bool pagesIdentical; - static const int kMaxCols = 96; - static const int kMaxRows = 96; - // Log text overlay, displayed when a magic key is pressed - char text[kMaxRows][kMaxCols]; - int text_cols, text_rows; - int text_col, text_row, text_top; + char** text; + size_t text_cols, text_rows; + size_t text_col, text_row, text_top; bool show_text; bool show_text_ever; // has show_text ever been true? - char menu[kMaxRows][kMaxCols]; + char** menu; bool show_menu; int menu_top, menu_items, menu_sel; @@ -102,8 +99,6 @@ class ScreenRecoveryUI : public RecoveryUI { int animation_fps; int installing_frames; - protected: - private: int iconX, iconY; |