commit c664a9a4232307f0260dac2839bb01e75b43c021
author Tao Bao <tbao@google.com> Mon Aug 28 20:38:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 28 20:38:54 2017 +0000
tree a05de9928a273182169c66d4883eeea786d5b854
parent 8d88fbcfe8e8d2a67c0d987737289167bac58eb7
parent f0487569fa4a2fd037bb39c6360ad3ea6184d654

Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." am: e9605b8ca0 am: d92baf5988 am: 35d36d1fa6
am: f0487569fa

Change-Id: I86301fcd8ef26bd11288ef209df0a903e76eeff6

wear_ui.cpp

diff --git a/wear_ui.cpp b/wear_ui.cpp
index 75d01bd..e480671 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -185,20 +185,6 @@
   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 @@
     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();
   }

wear_ui.h

diff --git a/wear_ui.h b/wear_ui.h
index d04718c..9731f41 100644
--- a/wear_ui.h
+++ b/wear_ui.h
@@ -50,8 +50,6 @@
 
   int GetProgressBaseline() const override;
 
-  bool InitTextParams() override;
-
   void update_progress_locked() override;
 
   void PrintV(const char*, bool, va_list) override;
@@ -59,13 +57,6 @@
  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;