summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-08-28 21:42:12 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-08-28 21:42:12 +0200
commite9605b8ca01fba6b0ed2d01677815882d6371a53 (patch)
tree2ba7c296c3e22533d4fce9d85bba1c8a45e52941
parentMerge "wear_ui: Remove dead 'self' and 'progress_t'." (diff)
parentwear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_. (diff)
downloadandroid_bootable_recovery-e9605b8ca01fba6b0ed2d01677815882d6371a53.tar
android_bootable_recovery-e9605b8ca01fba6b0ed2d01677815882d6371a53.tar.gz
android_bootable_recovery-e9605b8ca01fba6b0ed2d01677815882d6371a53.tar.bz2
android_bootable_recovery-e9605b8ca01fba6b0ed2d01677815882d6371a53.tar.lz
android_bootable_recovery-e9605b8ca01fba6b0ed2d01677815882d6371a53.tar.xz
android_bootable_recovery-e9605b8ca01fba6b0ed2d01677815882d6371a53.tar.zst
android_bootable_recovery-e9605b8ca01fba6b0ed2d01677815882d6371a53.zip
Diffstat (limited to '')
-rw-r--r--wear_ui.cpp16
-rw-r--r--wear_ui.h9
2 files changed, 1 insertions, 24 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 75d01bdc3..e4806718d 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -185,20 +185,6 @@ void WearRecoveryUI::update_progress_locked() {
gr_flip();
}
-bool WearRecoveryUI::InitTextParams() {
- if (!ScreenRecoveryUI::InitTextParams()) {
- return false;
- }
-
- text_cols_ = (gr_fb_width() - (kMarginWidth * 2)) / char_width_;
-
- if (text_rows_ > kMaxRows) text_rows_ = kMaxRows;
- if (text_cols_ > kMaxCols) text_cols_ = kMaxCols;
-
- visible_text_rows = (gr_fb_height() - (kMarginHeight * 2)) / char_height_;
- return true;
-}
-
bool WearRecoveryUI::Init(const std::string& locale) {
if (!ScreenRecoveryUI::Init(locale)) {
return false;
@@ -263,7 +249,7 @@ void WearRecoveryUI::StartMenu(const char* const* headers, const char* const* it
show_menu = true;
menu_sel = initial_selection;
menu_start = 0;
- menu_end = visible_text_rows - 1 - kMenuUnusableRows;
+ menu_end = text_rows_ - 1 - kMenuUnusableRows;
if (menu_items <= menu_end) menu_end = menu_items;
update_screen_locked();
}
diff --git a/wear_ui.h b/wear_ui.h
index d04718ccf..9731f4161 100644
--- a/wear_ui.h
+++ b/wear_ui.h
@@ -50,8 +50,6 @@ class WearRecoveryUI : public ScreenRecoveryUI {
int GetProgressBaseline() const override;
- bool InitTextParams() override;
-
void update_progress_locked() override;
void PrintV(const char*, bool, va_list) override;
@@ -59,13 +57,6 @@ class WearRecoveryUI : public ScreenRecoveryUI {
private:
GRSurface* backgroundIcon[5];
- static const int kMaxCols = 96;
- static const int kMaxRows = 96;
-
- // Number of text rows seen on screen
- int visible_text_rows;
-
- const char* const* menu_headers_;
int menu_start, menu_end;
void draw_background_locked() override;