Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_."
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 71a5351..e480671 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 @@
touch_screen_allowed_ = true;
for (size_t i = 0; i < 5; i++) backgroundIcon[i] = NULL;
-
- self = this;
}
int WearRecoveryUI::GetProgressBaseline() const {
diff --git a/wear_ui.h b/wear_ui.h
index 2c5b7e4..9731f41 100644
--- a/wear_ui.h
+++ b/wear_ui.h
@@ -59,8 +59,6 @@
int menu_start, menu_end;
- pthread_t progress_t;
-
void draw_background_locked() override;
void draw_screen_locked() override;