From 8e614b89838dda1adff952c0bfbb02721bb5db2b Mon Sep 17 00:00:00 2001 From: Tom Marshall Date: Thu, 27 Mar 2014 09:18:00 -0700 Subject: sr: Touch UI Change-Id: I4ee87f3474aec0496c47bb561ddecc74e151cbbf --- wear_ui.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'wear_ui.cpp') diff --git a/wear_ui.cpp b/wear_ui.cpp index 4a07f39..9d4ec09 100644 --- a/wear_ui.cpp +++ b/wear_ui.cpp @@ -122,7 +122,7 @@ void WearRecoveryUI::draw_background_locked(Icon icon) // Should only be called with updateMutex locked. void WearRecoveryUI::draw_progress_locked() { - if (currentIcon == ERROR) return; + if (currentIcon == D_ERROR) return; if (progressBarType != DETERMINATE) return; int width = progress_bar_width; @@ -348,8 +348,8 @@ void WearRecoveryUI::Init() LoadBitmap("icon_installing", &backgroundIcon[INSTALLING_UPDATE]); backgroundIcon[ERASING] = backgroundIcon[INSTALLING_UPDATE]; - LoadBitmap("icon_error", &backgroundIcon[ERROR]); - backgroundIcon[NO_COMMAND] = backgroundIcon[ERROR]; + LoadBitmap("icon_error", &backgroundIcon[D_ERROR]); + backgroundIcon[NO_COMMAND] = backgroundIcon[D_ERROR]; introFrames = (GRSurface**)malloc(intro_frames * sizeof(GRSurface*)); for (int i = 0; i < intro_frames; ++i) { @@ -503,7 +503,7 @@ void WearRecoveryUI::StartMenu(const char* const * headers, const char* const * pthread_mutex_unlock(&updateMutex); } -int WearRecoveryUI::SelectMenu(int sel) { +int WearRecoveryUI::SelectMenu(int sel, bool abs /* = false */) { int old_sel; pthread_mutex_lock(&updateMutex); if (show_menu > 0) { -- cgit v1.1