diff options
| author | Doug Zongker <dougz@android.com> | 2014-03-13 15:46:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 15:46:53 +0000 |
| commit | 4048200cd6baf8df35f7100afbdbd3067502eae8 (patch) | |
| tree | 35998afaedc55bed4c3f44b95fb407825c25c006 /screen_ui.cpp | |
| parent | 546f357d038466b0fd055a5d9a6baee20e8cdcfe (diff) | |
| parent | c91612d4668688c5d7bf76c258c11010697a03d2 (diff) | |
| download | bootable_recovery-4048200cd6baf8df35f7100afbdbd3067502eae8.tar.gz bootable_recovery-4048200cd6baf8df35f7100afbdbd3067502eae8.tar.bz2 bootable_recovery-4048200cd6baf8df35f7100afbdbd3067502eae8.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.cpp | 14 |
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; |