commit e6fa4f2ca73ba182c4be14e05ae2616c93fa2577
author Tao Bao <tbao@google.com> Fri Sep 01 18:28:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 01 18:28:09 2017 +0000
tree 6e0b0fae42120d8d170e5941f1ddea0053da5885
parent e779083f595d7b9c94d7bc01ed346b630c437e05
parent 27c4410a48522a9c17257ad985106b6f28834601

Merge "wear_ui: Remove backgroundIcon." am: 6e426f2b76 am: 3650e7c19b am: b457e24fac
am: 27c4410a48

Change-Id: I1e13196dbc4a8e56c0777db9844f74bf65964f20

wear_ui.cpp

diff --git a/wear_ui.cpp b/wear_ui.cpp
index 85c8f83..b9289d3 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -50,8 +50,6 @@
   loop_frames = 60;
 
   touch_screen_allowed_ = true;
-
-  for (size_t i = 0; i < 5; i++) backgroundIcon[i] = NULL;
 }
 
 int WearRecoveryUI::GetProgressBaseline() const {
@@ -67,24 +65,12 @@
   gr_fill(0, 0, gr_fb_width(), gr_fb_height());
 
   if (currentIcon != NONE) {
-    GRSurface* surface;
-    if (currentIcon == INSTALLING_UPDATE || currentIcon == ERASING) {
-      if (!intro_done) {
-        surface = introFrames[current_frame];
-      } else {
-        surface = loopFrames[current_frame];
-      }
-    } else {
-      surface = backgroundIcon[currentIcon];
-    }
-
-    int width = gr_get_width(surface);
-    int height = gr_get_height(surface);
-
-    int x = (gr_fb_width() - width) / 2;
-    int y = (gr_fb_height() - height) / 2;
-
-    gr_blit(surface, 0, 0, width, height, x, y);
+    GRSurface* frame = GetCurrentFrame();
+    int frame_width = gr_get_width(frame);
+    int frame_height = gr_get_height(frame);
+    int frame_x = (gr_fb_width() - frame_width) / 2;
+    int frame_y = (gr_fb_height() - frame_height) / 2;
+    gr_blit(frame, 0, 0, frame_width, frame_height, frame_x, frame_y);
   }
 }
 
@@ -177,20 +163,6 @@
   gr_flip();
 }
 
-bool WearRecoveryUI::Init(const std::string& locale) {
-  if (!ScreenRecoveryUI::Init(locale)) {
-    return false;
-  }
-
-  LoadBitmap("icon_error", &backgroundIcon[ERROR]);
-  backgroundIcon[NO_COMMAND] = backgroundIcon[ERROR];
-
-  // This leaves backgroundIcon[INSTALLING_UPDATE] and backgroundIcon[ERASING]
-  // as NULL which is fine since draw_background_locked() doesn't use them.
-
-  return true;
-}
-
 void WearRecoveryUI::SetStage(int current, int max) {
 }
 

wear_ui.h

diff --git a/wear_ui.h b/wear_ui.h
index 9731f41..e97598b 100644
--- a/wear_ui.h
+++ b/wear_ui.h
@@ -25,8 +25,6 @@
  public:
   WearRecoveryUI();
 
-  bool Init(const std::string& locale) override;
-
   void SetStage(int current, int max) override;
 
   // printing messages
@@ -55,14 +53,12 @@
   void PrintV(const char*, bool, va_list) override;
 
  private:
-  GRSurface* backgroundIcon[5];
-
-  int menu_start, menu_end;
-
   void draw_background_locked() override;
   void draw_screen_locked() override;
 
   void PutChar(char);
+
+  int menu_start, menu_end;
 };
 
 #endif  // RECOVERY_WEAR_UI_H