From dff8afe1b21c6ffe09269434f9f8f0d166e1a848 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Tue, 3 Jun 2014 10:50:13 -0700 Subject: [PATCH] restore holo UI in recovery -- DO NOT MERGE Since we don't have quantum assets for recovery yet, go back to the holo appearance (dark background, blue glowing progress bar) for lmp-preview. Change-Id: Id4d3f23e0a6251a12aa42f3793cff347f38b4243 --- res-hdpi/images/progress_empty.png | Bin 81 -> 118 bytes res-hdpi/images/progress_fill.png | Bin 83 -> 404 bytes res-mdpi/images/progress_empty.png | Bin 74 -> 118 bytes res-mdpi/images/progress_fill.png | Bin 83 -> 404 bytes res-xhdpi/images/progress_empty.png | Bin 84 -> 118 bytes res-xhdpi/images/progress_fill.png | Bin 84 -> 404 bytes res-xxhdpi/images/progress_empty.png | Bin 86 -> 118 bytes res-xxhdpi/images/progress_fill.png | Bin 86 -> 404 bytes res-xxxhdpi/images/progress_empty.png | Bin 90 -> 118 bytes res-xxxhdpi/images/progress_fill.png | Bin 90 -> 404 bytes screen_ui.cpp | 29 ++++++++++++++------------ screen_ui.h | 3 --- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/res-hdpi/images/progress_empty.png b/res-hdpi/images/progress_empty.png index b29d9be0c3f36772498d29a344fd9713f7d76fcf..72581832c2d3e429012f7b2506f15f6165a0c81c 100644 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^e}I^sg9%73p0oWGkh1l3aSW-L^Y;2iUIqgW=7Sba zAshbh%3*B%ulD0m@6?(61wuV?d5d(9*jMYlPgz^4M-)VwjjX RsQ_dHgQu&X%Q~loCIDU+C|&>n literal 81 zcmeAS@N?(olHy`uVBq!ia0vp^AAp#R14uC3`0C>Yq$E6D978G?lPe4k9az!cE-Uf% e!w0s-a%>Dy`fqHlYi}7(bkr*$ak&PJp8 zO=Vu;CVM0_T`5woek3*QMWZxrT5$hHbCNW}dH_HIz-HqEY(g;?i#V{24IE#PR$dTD z_)?`T!{$}1Z)uwKqnW)hF5}Pi(%FAu`uZ%3o+Cb0pC!ipmr{7&>He{01iJ!;+lCvC zWZQ=xy`ZY4tlOJv22iWBODh2IM*rUxE1o!(=~uj52)=FyTxa@qrtb;<>6xCL@*(T( y%}mUg{_6OR>AR~r#k-=fwPddAM&b+J-uwW*e*ZAYSL$p40000d%8G= eR4^t>Yyxt2F)*^uOL+riF?hQAxvX(9*jMYlPgz^4M-)VwjjX RsQ_dHgQu&X%Q~loCIDU+C|&>n literal 74 zcmeAS@N?(olHy`uVBq!ia0vp^3xJq~14uCFXl8Q)DM3#c$B+ufISi#KL WeZ)ZCPoD1xNRg+jpUXO@geCwAP7xIV diff --git a/res-mdpi/images/progress_fill.png b/res-mdpi/images/progress_fill.png index c223871b9bb3b7c0f73c44a168d61941a9cf4d54..becf87bdfe8cc31f44b77cd81d9305cf04252e91 100644 GIT binary patch literal 404 zcmV;F0c-w=P)7(bkr*$ak&PJp8 zO=Vu;CVM0_T`5woek3*QMWZxrT5$hHbCNW}dH_HIz-HqEY(g;?i#V{24IE#PR$dTD z_)?`T!{$}1Z)uwKqnW)hF5}Pi(%FAu`uZ%3o+Cb0pC!ipmr{7&>He{01iJ!;+lCvC zWZQ=xy`ZY4tlOJv22iWBODh2IM*rUxE1o!(=~uj52)=FyTxa@qrtb;<>6xCL@*(T( y%}mUg{_6OR>AR~r#k-=fwPddAM&b+J-uwW*e*ZAYSL$p40000(9*jMYlPgz^4M-)VwjjX RsQ_dHgQu&X%Q~loCIDU+C|&>n literal 84 zcmeAS@N?(olHy`uVBq!ia0y~yU~~YoIT)FN7(bkr*$ak&PJp8 zO=Vu;CVM0_T`5woek3*QMWZxrT5$hHbCNW}dH_HIz-HqEY(g;?i#V{24IE#PR$dTD z_)?`T!{$}1Z)uwKqnW)hF5}Pi(%FAu`uZ%3o+Cb0pC!ipmr{7&>He{01iJ!;+lCvC zWZQ=xy`ZY4tlOJv22iWBODh2IM*rUxE1o!(=~uj52)=FyTxa@qrtb;<>6xCL@*(T( y%}mUg{_6OR>AR~r#k-=fwPddAM&b+J-uwW*e*ZAYSL$p40000u-E{~^+ gV@L&K@&YaiRt8272F74Mb&zTXPgg&ebxsLQ0E0XbZU6uP diff --git a/res-xxhdpi/images/progress_empty.png b/res-xxhdpi/images/progress_empty.png index 57c8235874c46d05324ff5c86bbc0d6b43da7fd8..72581832c2d3e429012f7b2506f15f6165a0c81c 100644 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^e}I^sg9%73p0oWGkh1l3aSW-L^Y;2iUIqgW=7Sba zAshbh%3*B%ulD0m@6?(61wuV?d5d(9*jMYlPgz^4M-)VwjjX RsQ_dHgQu&X%Q~loCIDU+C|&>n literal 86 zcmeAS@N?(olHy`uVBq!ia0y~yV0-{%^Dr_4$%fZ|W&6c=P8Skjv-k k;uuoFm@Kg@L8OO?f$0td<7_wEG@uNFr>mdKI;Vst0IgpakN^Mx diff --git a/res-xxhdpi/images/progress_fill.png b/res-xxhdpi/images/progress_fill.png index 0f36f48c243847b71f78b77d958a8f74e1fa161b..becf87bdfe8cc31f44b77cd81d9305cf04252e91 100644 GIT binary patch literal 404 zcmV;F0c-w=P)7(bkr*$ak&PJp8 zO=Vu;CVM0_T`5woek3*QMWZxrT5$hHbCNW}dH_HIz-HqEY(g;?i#V{24IE#PR$dTD z_)?`T!{$}1Z)uwKqnW)hF5}Pi(%FAu`uZ%3o+Cb0pC!ipmr{7&>He{01iJ!;+lCvC zWZQ=xy`ZY4tlOJv22iWBODh2IM*rUxE1o!(=~uj52)=FyTxa@qrtb;<>6xCL@*(T( y%}mUg{_6OR>AR~r#k-=fwPddAM&b+J-uwW*e*ZAYSL$p40000tz&UUj+1IjRXy85}Sb4q9e05ujAxc~qF diff --git a/res-xxxhdpi/images/progress_empty.png b/res-xxxhdpi/images/progress_empty.png index ba25afb6e2387d0ef94c46cb4e3c0e19a8da3655..72581832c2d3e429012f7b2506f15f6165a0c81c 100644 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^e}I^sg9%73p0oWGkh1l3aSW-L^Y;2iUIqgW=7Sba zAshbh%3*B%ulD0m@6?(61wuV?d5d(9*jMYlPgz^4M-)VwjjX RsQ_dHgQu&X%Q~loCIDU+C|&>n literal 90 zcmeAS@N?(olHy`uVBq!ia0y~yU}^xe1sIuu7(bkr*$ak&PJp8 zO=Vu;CVM0_T`5woek3*QMWZxrT5$hHbCNW}dH_HIz-HqEY(g;?i#V{24IE#PR$dTD z_)?`T!{$}1Z)uwKqnW)hF5}Pi(%FAu`uZ%3o+Cb0pC!ipmr{7&>He{01iJ!;+lCvC zWZQ=xy`ZY4tlOJv22iWBODh2IM*rUxE1o!(=~uj52)=FyTxa@qrtb;<>6xCL@*(T( y%}mUg{_6OR>AR~r#k-=fwPddAM&b+J-uwW*e*ZAYSL$p40000RudLY^*; nAr*|t49$TCTy6(7Bv=_(1sE8`_a`3)$})Jm`njxgN@xNADTEWn diff --git a/screen_ui.cpp b/screen_ui.cpp index d087af32..03ef049a 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -89,7 +89,7 @@ ScreenRecoveryUI::ScreenRecoveryUI() : void ScreenRecoveryUI::draw_background_locked(Icon icon) { pagesIdentical = false; - gr_color(250, 250, 250, 255); + gr_color(0, 0, 0, 255); gr_clear(); if (icon) { @@ -125,7 +125,7 @@ void ScreenRecoveryUI::draw_background_locked(Icon icon) } } - gr_color(115, 115, 115, 255); + gr_color(255, 255, 255, 255); gr_texticon(textX, textY, text_surface); } } @@ -150,7 +150,7 @@ void ScreenRecoveryUI::draw_progress_locked() int dy = (3*gr_fb_height() + iconHeight - 2*height)/4; // Erase behind the progress bar (in case this was a progress-only update) - gr_color(250, 250, 250, 255); + gr_color(0, 0, 0, 255); gr_fill(dx, dy, width, height); if (progressBarType == DETERMINATE) { @@ -181,17 +181,20 @@ void ScreenRecoveryUI::draw_progress_locked() void ScreenRecoveryUI::SetColor(UIElement e) { switch (e) { case HEADER: - gr_color(0xff, 0x57, 0x22, 255); // Quantum "Deep Orange" 500 + gr_color(247, 0, 6, 255); break; case MENU: case MENU_SEL_BG: - gr_color(0x67, 0x3a, 0xb7, 255); // Quantum "Deep Purple" 500 + gr_color(0, 106, 157, 255); break; case MENU_SEL_FG: gr_color(255, 255, 255, 255); break; case LOG: - gr_color(0x3f, 0x51, 0xb5, 255); // Quantum "Indigo" 500 + gr_color(249, 194, 0, 255); + break; + case TEXT_FILL: + gr_color(0, 0, 0, 160); break; default: gr_color(255, 255, 255, 255); @@ -207,7 +210,7 @@ void ScreenRecoveryUI::draw_screen_locked() draw_background_locked(currentIcon); draw_progress_locked(); } else { - gr_color(250, 250, 250, 255); + gr_color(0, 0, 0, 255); gr_clear(); int y = 0; @@ -221,13 +224,13 @@ void ScreenRecoveryUI::draw_screen_locked() if (i == menu_top + menu_sel) { // draw the highlight bar SetColor(MENU_SEL_BG); - gr_fill(0, y-2+kTextYOffset, gr_fb_width(), y+char_height+2+kTextYOffset); + gr_fill(0, y-2, gr_fb_width(), y+char_height+2); // white text of selected item SetColor(MENU_SEL_FG); - if (menu[i][0]) gr_text(kTextXOffset, y+kTextYOffset, menu[i], 1); + if (menu[i][0]) gr_text(4, y, menu[i], 1); SetColor(MENU); } else { - if (menu[i][0]) gr_text(kTextXOffset, y+kTextYOffset, menu[i], i < menu_top); + if (menu[i][0]) gr_text(4, y, menu[i], i < menu_top); } y += char_height+4; } @@ -248,7 +251,7 @@ void ScreenRecoveryUI::draw_screen_locked() for (int ty = gr_fb_height() - char_height, count = 0; ty > y+2 && count < text_rows; ty -= char_height, ++count) { - gr_text(kTextXOffset, ty+kTextYOffset, text[row], 0); + gr_text(4, ty, text[row], 0); --row; if (row < 0) row = text_rows-1; } @@ -349,11 +352,11 @@ void ScreenRecoveryUI::Init() gr_font_size(&char_width, &char_height); text_col = text_row = 0; - text_rows = (gr_fb_height() - 2 * kTextYOffset) / char_height; + text_rows = gr_fb_height() / char_height; if (text_rows > kMaxRows) text_rows = kMaxRows; text_top = 1; - text_cols = (gr_fb_width() - 2 * kTextXOffset) / char_width; + text_cols = gr_fb_width() / char_width; if (text_cols > kMaxCols - 1) text_cols = kMaxCols - 1; backgroundIcon[NONE] = NULL; diff --git a/screen_ui.h b/screen_ui.h index d5e58922..01a33bfe 100644 --- a/screen_ui.h +++ b/screen_ui.h @@ -87,9 +87,6 @@ class ScreenRecoveryUI : public RecoveryUI { static const int kMaxCols = 96; static const int kMaxRows = 96; - static const int kTextXOffset = 8; - static const int kTextYOffset = 4; - // Log text overlay, displayed when a magic key is pressed char text[kMaxRows][kMaxCols]; int text_cols, text_rows;