diff options
| author | Tao Bao <tbao@google.com> | 2017-08-28 21:42:12 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-08-28 21:42:12 +0200 |
| commit | e9605b8ca01fba6b0ed2d01677815882d6371a53 (patch) | |
| tree | 2ba7c296c3e22533d4fce9d85bba1c8a45e52941 /wear_ui.cpp | |
| parent | Merge "wear_ui: Remove dead 'self' and 'progress_t'." (diff) | |
| parent | wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_. (diff) | |
| download | android_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 'wear_ui.cpp')
| -rw-r--r-- | wear_ui.cpp | 16 |
1 files changed, 1 insertions, 15 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(); } |