aboutsummaryrefslogtreecommitdiffstats
path: root/screen_ui.cpp
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2014-03-12 02:42:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-12 02:42:57 +0000
commitcb1bdc9e427b8b7262d1e56fef47d2bb6d76139f (patch)
treefcabf54bb6676e3e34a33d16ab79a15c11c2f661 /screen_ui.cpp
parent7003ff3b54e9081dba92ecfea0594355af40e6dd (diff)
parentc91612d4668688c5d7bf76c258c11010697a03d2 (diff)
downloadbootable_recovery-cb1bdc9e427b8b7262d1e56fef47d2bb6d76139f.tar.gz
bootable_recovery-cb1bdc9e427b8b7262d1e56fef47d2bb6d76139f.tar.bz2
bootable_recovery-cb1bdc9e427b8b7262d1e56fef47d2bb6d76139f.zip
am c91612d4: Merge "remove pixelflinger from recovery"
* commit 'c91612d4668688c5d7bf76c258c11010697a03d2': remove pixelflinger from recovery
Diffstat (limited to 'screen_ui.cpp')
-rw-r--r--screen_ui.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp
index 29d5491..86429c9 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -86,7 +86,7 @@ void ScreenRecoveryUI::draw_background_locked(Icon icon)
{
pagesIdentical = false;
gr_color(0, 0, 0, 255);
- gr_fill(0, 0, gr_fb_width(), gr_fb_height());
+ gr_clear();
if (icon) {
gr_surface surface = backgroundIcon[icon];
@@ -203,12 +203,12 @@ void ScreenRecoveryUI::SetColor(UIElement e) {
// Should only be called with updateMutex locked.
void ScreenRecoveryUI::draw_screen_locked()
{
- draw_background_locked(currentIcon);
- draw_progress_locked();
-
- if (show_text) {
- SetColor(TEXT_FILL);
- gr_fill(0, 0, gr_fb_width(), gr_fb_height());
+ if (!show_text) {
+ draw_background_locked(currentIcon);
+ draw_progress_locked();
+ } else {
+ gr_color(0, 0, 0, 255);
+ gr_clear();
int y = 0;
int i = 0;