recovery: add new recovery and fastbootd logos
Designed-by: Asher Simonds <asher@ashersimonds.com>
Change-Id: I9ec279a35448393c26ada57988266994c17fc1b9
Co-authored-by: Asher Simonds <asher@ashersimonds.com>
Co-authored-by: Jesse Chan <jc@lineageos.org>
diff --git a/recovery_ui/screen_ui.cpp b/recovery_ui/screen_ui.cpp
index 65aff9d..c4c8f93 100644
--- a/recovery_ui/screen_ui.cpp
+++ b/recovery_ui/screen_ui.cpp
@@ -786,25 +786,17 @@
const std::vector<std::string>& help_message) {
int y = margin_height_;
- if (fastbootd_logo_ && fastbootd_logo_enabled_) {
- // Try to get this centered on screen.
- auto width = gr_get_width(fastbootd_logo_.get());
- auto height = gr_get_height(fastbootd_logo_.get());
- auto centered_x = ScreenWidth() / 2 - width / 2;
- DrawSurface(fastbootd_logo_.get(), 0, 0, width, height, centered_x, y);
- y += height;
- }
-
if (menu_) {
int x = margin_width_ + kMenuIndent;
SetColor(UIElement::INFO);
- if (lineage_logo_ && back_icon_) {
- auto logo_width = gr_get_width(lineage_logo_.get());
- auto logo_height = gr_get_height(lineage_logo_.get());
+ auto& logo = fastbootd_logo_enabled_ ? fastbootd_logo_ : lineage_logo_;
+ if (logo && back_icon_) {
+ auto logo_width = gr_get_width(logo.get());
+ auto logo_height = gr_get_height(logo.get());
auto centered_x = ScreenWidth() / 2 - logo_width / 2;
- DrawSurface(lineage_logo_.get(), 0, 0, logo_width, logo_height, centered_x, y);
+ DrawSurface(logo.get(), 0, 0, logo_width, logo_height, centered_x, y);
y += logo_height;
if (!menu_->IsMain()) {
diff --git a/res-hdpi/images/fastbootd.png b/res-hdpi/images/fastbootd.png
index 5127b3b..7ff977c 100644
--- a/res-hdpi/images/fastbootd.png
+++ b/res-hdpi/images/fastbootd.png
Binary files differ
diff --git a/res-hdpi/images/logo_image.png b/res-hdpi/images/logo_image.png
index e41b170..a074dfc 100644
--- a/res-hdpi/images/logo_image.png
+++ b/res-hdpi/images/logo_image.png
Binary files differ
diff --git a/res-mdpi/images/fastbootd.png b/res-mdpi/images/fastbootd.png
index c1b7bc2..2797bfa 100644
--- a/res-mdpi/images/fastbootd.png
+++ b/res-mdpi/images/fastbootd.png
Binary files differ
diff --git a/res-mdpi/images/logo_image.png b/res-mdpi/images/logo_image.png
index 2785e0d..ba2d185 100644
--- a/res-mdpi/images/logo_image.png
+++ b/res-mdpi/images/logo_image.png
Binary files differ
diff --git a/res-xhdpi/images/fastbootd.png b/res-xhdpi/images/fastbootd.png
index e3da85a..e54976b 100644
--- a/res-xhdpi/images/fastbootd.png
+++ b/res-xhdpi/images/fastbootd.png
Binary files differ
diff --git a/res-xhdpi/images/logo_image.png b/res-xhdpi/images/logo_image.png
index f8cfa83..928cffd 100644
--- a/res-xhdpi/images/logo_image.png
+++ b/res-xhdpi/images/logo_image.png
Binary files differ
diff --git a/res-xxhdpi/images/fastbootd.png b/res-xxhdpi/images/fastbootd.png
index 482dbb2..891776b 100644
--- a/res-xxhdpi/images/fastbootd.png
+++ b/res-xxhdpi/images/fastbootd.png
Binary files differ
diff --git a/res-xxhdpi/images/logo_image.png b/res-xxhdpi/images/logo_image.png
index 5c16278..af1aed7 100644
--- a/res-xxhdpi/images/logo_image.png
+++ b/res-xxhdpi/images/logo_image.png
Binary files differ
diff --git a/res-xxxhdpi/images/fastbootd.png b/res-xxxhdpi/images/fastbootd.png
index a878b1f..220452b 100644
--- a/res-xxxhdpi/images/fastbootd.png
+++ b/res-xxxhdpi/images/fastbootd.png
Binary files differ
diff --git a/res-xxxhdpi/images/logo_image.png b/res-xxxhdpi/images/logo_image.png
index 981fe3d..cba0ca6 100644
--- a/res-xxxhdpi/images/logo_image.png
+++ b/res-xxxhdpi/images/logo_image.png
Binary files differ
