PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
TreeHugger Robot
2016-12-16 00:37:03 +00:00
committed by Android (Google) Code Review
parent cb15594696 a5876e43f7
commit 910c83b915
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wear_ui.cpp
+4 -2
View File
@@ -209,10 +209,12 @@ bool WearRecoveryUI::Init() {
return false; return false;
} }
LoadBitmap("icon_installing", &backgroundIcon[INSTALLING_UPDATE]);
backgroundIcon[ERASING] = backgroundIcon[INSTALLING_UPDATE];
LoadBitmap("icon_error", &backgroundIcon[ERROR]); LoadBitmap("icon_error", &backgroundIcon[ERROR]);
backgroundIcon[NO_COMMAND] = 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; return true;
} }