From 1e27d14eea7c11eb099e0e05dd0e26a49f21a13b Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Sat, 26 Aug 2017 08:32:29 -0700
Subject: wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_.

We've deprecated kMaxCols/kMaxRows in ScreenRecoveryUI since commit
aa0d6afb61f4cf928e87c7a21bcb59fc973f15a0. They unnecessarily limit the
screen size to 96x96 characters.

Also remove the recomputations of text_cols, visible_text_rows (which is
the same as text_rows_). Remove the unintentional hiding of menu_headers_.

Test: mmma bootable/recovery
Change-Id: I7d1526b651943312d62d52cd200414b42bf9b12a
---
 wear_ui.h | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'wear_ui.h')

diff --git a/wear_ui.h b/wear_ui.h
index 3bd90b699..2c5b7e481 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;
 
   pthread_t progress_t;
-- 
cgit v1.2.3