diff options
author | Tao Bao <tbao@google.com> | 2017-08-28 21:57:19 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-28 21:57:19 +0200 |
commit | 35d36d1fa6fe8351fe03e7149bcc838faee89b90 (patch) | |
tree | acb17e05f98f4425da4b1473cce2e73cccf3586d | |
parent | Merge "wear_ui: Remove dead 'self' and 'progress_t'." am: 2e125bec2f (diff) | |
parent | Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." (diff) | |
download | android_bootable_recovery-35d36d1fa6fe8351fe03e7149bcc838faee89b90.tar android_bootable_recovery-35d36d1fa6fe8351fe03e7149bcc838faee89b90.tar.gz android_bootable_recovery-35d36d1fa6fe8351fe03e7149bcc838faee89b90.tar.bz2 android_bootable_recovery-35d36d1fa6fe8351fe03e7149bcc838faee89b90.tar.lz android_bootable_recovery-35d36d1fa6fe8351fe03e7149bcc838faee89b90.tar.xz android_bootable_recovery-35d36d1fa6fe8351fe03e7149bcc838faee89b90.tar.zst android_bootable_recovery-35d36d1fa6fe8351fe03e7149bcc838faee89b90.zip |
-rw-r--r-- | wear_ui.cpp | 16 | ||||
-rw-r--r-- | wear_ui.h | 9 |
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(); } @@ -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; |