commit 82ffc16e85de2f439466a4e56963cefa67360187
author Alessandro Astone <ales.astone@gmail.com> Sun Mar 29 15:08:09 2020 +0200
committer Nick Reuter <nreuter85@gmail.com> Sun Jun 18 00:59:28 2023 -0500
tree 8f100eb4246829f98f9207c942f219a477d59176
parent efc7a8e27fdff5f41c7e65561397f2c2bf5c903c

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>

recovery: Stop showing fastbootd logo for devices without it

Change-Id: I03371cfd0dc7ddd020a80aeae1c034a276832ba9

recovery_ui/screen_ui.cpp

diff --git a/recovery_ui/screen_ui.cpp b/recovery_ui/screen_ui.cpp
index 63c4d4a..07af7ac 100644
--- a/recovery_ui/screen_ui.cpp
+++ b/recovery_ui/screen_ui.cpp
@@ -792,25 +792,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()) {
@@ -1044,12 +1036,14 @@
   no_command_text_ = LoadLocalizedBitmap("no_command_text");
   error_text_ = LoadLocalizedBitmap("error_text");
 
-  lineage_logo_ = LoadBitmap("logo_image");
   back_icon_ = LoadBitmap("ic_back");
   back_icon_sel_ = LoadBitmap("ic_back_sel");
   if (android::base::GetBoolProperty("ro.boot.dynamic_partitions", false) ||
       android::base::GetBoolProperty("ro.fastbootd.available", false)) {
+    lineage_logo_ = LoadBitmap("logo_image_switch");
     fastbootd_logo_ = LoadBitmap("fastbootd");
+  } else {
+    lineage_logo_ = LoadBitmap("logo_image");
   }
 
   // Background text for "installing_update" could be "installing update" or