summaryrefslogtreecommitdiffstats
path: root/screen_ui.h
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-09 02:31:26 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-09 02:31:26 +0200
commit0d4f2b6d9ad1c5980f3ece965c4c4a49726c29f4 (patch)
tree58208cc69b57a78a0cc90e81d73c3d8da55f3b7f /screen_ui.h
parentam 64346eae: Merge "Remove a couple of unused inlines from minzip/Zip.h." (diff)
parentMerge "Remove the fixed screen size assumptions." (diff)
downloadandroid_bootable_recovery-0d4f2b6d9ad1c5980f3ece965c4c4a49726c29f4.tar
android_bootable_recovery-0d4f2b6d9ad1c5980f3ece965c4c4a49726c29f4.tar.gz
android_bootable_recovery-0d4f2b6d9ad1c5980f3ece965c4c4a49726c29f4.tar.bz2
android_bootable_recovery-0d4f2b6d9ad1c5980f3ece965c4c4a49726c29f4.tar.lz
android_bootable_recovery-0d4f2b6d9ad1c5980f3ece965c4c4a49726c29f4.tar.xz
android_bootable_recovery-0d4f2b6d9ad1c5980f3ece965c4c4a49726c29f4.tar.zst
android_bootable_recovery-0d4f2b6d9ad1c5980f3ece965c4c4a49726c29f4.zip
Diffstat (limited to 'screen_ui.h')
-rw-r--r--screen_ui.h13
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;