summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Kryger <tkryger@google.com>2016-12-15 21:39:36 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-12-15 21:39:36 +0100
commit14bdbb6c7703854d2f8f4bafd19a4c2013c1d6ee (patch)
treeb3b4d4871a65c06c1fcf2e451a1ad4e88d110452
parentDO NOT MERGE updater: Add "write_value()" function. (diff)
parentRemove outdated reference to icon_installing.png (diff)
downloadandroid_bootable_recovery-14bdbb6c7703854d2f8f4bafd19a4c2013c1d6ee.tar
android_bootable_recovery-14bdbb6c7703854d2f8f4bafd19a4c2013c1d6ee.tar.gz
android_bootable_recovery-14bdbb6c7703854d2f8f4bafd19a4c2013c1d6ee.tar.bz2
android_bootable_recovery-14bdbb6c7703854d2f8f4bafd19a4c2013c1d6ee.tar.lz
android_bootable_recovery-14bdbb6c7703854d2f8f4bafd19a4c2013c1d6ee.tar.xz
android_bootable_recovery-14bdbb6c7703854d2f8f4bafd19a4c2013c1d6ee.tar.zst
android_bootable_recovery-14bdbb6c7703854d2f8f4bafd19a4c2013c1d6ee.zip
-rw-r--r--wear_ui.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp
index bfa7097ea..660a078fc 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -204,10 +204,11 @@ void WearRecoveryUI::InitTextParams() {
void WearRecoveryUI::Init() {
ScreenRecoveryUI::Init();
- LoadBitmap("icon_installing", &backgroundIcon[INSTALLING_UPDATE]);
- backgroundIcon[ERASING] = backgroundIcon[INSTALLING_UPDATE];
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.
}
void WearRecoveryUI::SetStage(int current, int max)