summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-09-01 20:21:08 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-09-01 20:21:08 +0200
commit27c4410a48522a9c17257ad985106b6f28834601 (patch)
tree161b91c679896fd24f503342507c1151997f290b
parentMerge "Turn on -Wall for libedify" am: deb5de0bc1 am: 365059c61b (diff)
parentMerge "wear_ui: Remove backgroundIcon." am: 6e426f2b76 (diff)
downloadandroid_bootable_recovery-27c4410a48522a9c17257ad985106b6f28834601.tar
android_bootable_recovery-27c4410a48522a9c17257ad985106b6f28834601.tar.gz
android_bootable_recovery-27c4410a48522a9c17257ad985106b6f28834601.tar.bz2
android_bootable_recovery-27c4410a48522a9c17257ad985106b6f28834601.tar.lz
android_bootable_recovery-27c4410a48522a9c17257ad985106b6f28834601.tar.xz
android_bootable_recovery-27c4410a48522a9c17257ad985106b6f28834601.tar.zst
android_bootable_recovery-27c4410a48522a9c17257ad985106b6f28834601.zip
-rw-r--r--wear_ui.cpp40
-rw-r--r--wear_ui.h8
2 files changed, 8 insertions, 40 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 85c8f835d..b9289d366 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -50,8 +50,6 @@ WearRecoveryUI::WearRecoveryUI()
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 @@ void WearRecoveryUI::draw_background_locked() {
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 @@ void WearRecoveryUI::update_progress_locked() {
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) {
}
diff --git a/wear_ui.h b/wear_ui.h
index 9731f4161..e97598bb1 100644
--- a/wear_ui.h
+++ b/wear_ui.h
@@ -25,8 +25,6 @@ class WearRecoveryUI : public ScreenRecoveryUI {
public:
WearRecoveryUI();
- bool Init(const std::string& locale) override;
-
void SetStage(int current, int max) override;
// printing messages
@@ -55,14 +53,12 @@ class WearRecoveryUI : public ScreenRecoveryUI {
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