diff options
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | wear_ui.cpp | 24 | ||||
| -rw-r--r-- | wear_ui.h | 11 |
3 files changed, 3 insertions, 33 deletions
diff --git a/Android.mk b/Android.mk index 776e6ea19..aaae6a0ab 100644 --- a/Android.mk +++ b/Android.mk @@ -159,6 +159,7 @@ LOCAL_STATIC_LIBRARIES := \ libmounts \ libz \ libminadbd \ + libasyncio \ libfusesideload \ libminui \ libpng \ diff --git a/wear_ui.cpp b/wear_ui.cpp index 169ef20e1..e4806718d 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -18,6 +18,7 @@ #include <errno.h> #include <fcntl.h> +#include <pthread.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> @@ -38,11 +39,6 @@ #include "common.h" #include "device.h" -// There's only (at most) one of these objects, and global callbacks -// (for pthread_create, and the input event system) need to find it, -// so use a global variable. -static WearRecoveryUI* self = NULL; - // Return the current time as a double (including fractions of a second). static double now() { struct timeval tv; @@ -63,8 +59,6 @@ WearRecoveryUI::WearRecoveryUI() touch_screen_allowed_ = true; for (size_t i = 0; i < 5; i++) backgroundIcon[i] = NULL; - - self = this; } int WearRecoveryUI::GetProgressBaseline() const { @@ -191,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; @@ -269,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,17 +57,8 @@ 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; - void draw_background_locked() override; void draw_screen_locked() override; |