Snap for 11078623 from 610a9fe99407b31a00e00a51b92eb24b320f5530 to 24Q1-release

Change-Id: I07241fd502ac99833c2aa038b48e4cb76a1f5f90

4 files changed, 2 insertions, 12 deletions

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 7806248c..42f985e4 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -70,6 +70,7 @@ Device::BuiltinAction StartFastboot(Device* device, const std::vector<std::strin
   if (ui->IsWearable()) {
     FillWearableFastbootLines(title_lines);
   } else {
+    ui->SetEnableFastbootdLogo(true);
     FillDefaultFastbootLines(title_lines);
   }
 
diff --git a/recovery_main.cpp b/recovery_main.cpp
index 9a358aba..1c2b4073 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -485,8 +485,6 @@ int main(int argc, char** argv) {
       }
     }
 
-    ui->SetEnableFastbootdLogo(fastboot);
-
     auto ret = fastboot ? StartFastboot(device, args) : start_recovery(device, args);
 
     if (ret == Device::KEY_INTERRUPTED) {
diff --git a/recovery_ui/screen_ui.cpp b/recovery_ui/screen_ui.cpp
index 37e07646..ee3cbb13 100644
--- a/recovery_ui/screen_ui.cpp
+++ b/recovery_ui/screen_ui.cpp
@@ -181,15 +181,7 @@ int TextMenu::DrawItems(int x, int y, int screen_width, bool long_press) const {
   if (!scrollable()) {
     offset += draw_funcs_.DrawHorizontalRule(y + offset) + 4;
   }
-
-  int items_block_height = gr_fb_height() - y - offset;;
-  int total = (char_height_ + 4) * (selection() + 1);;
-  int j = 0;
-  if (total > items_block_height) {
-    j = ((total - items_block_height) / (char_height_ + 4)) + 1;
-  }
-
-  for (size_t i = (MenuStart() + j); i < MenuEnd(); ++i) {
+  for (size_t i = MenuStart(); i < MenuEnd(); ++i) {
     bool bold = false;
     if (i == selection()) {
       // Draw the highlight bar.
diff --git a/recovery_ui/wear_ui.cpp b/recovery_ui/wear_ui.cpp
index 309891cd..7b9ecf8e 100644
--- a/recovery_ui/wear_ui.cpp
+++ b/recovery_ui/wear_ui.cpp
@@ -42,7 +42,6 @@ WearRecoveryUI::WearRecoveryUI()
                                                              kDefaultIsScreenCircle)) {
   // TODO: menu_unusable_rows_ should be computed based on the lines in draw_screen_locked().
   touch_screen_allowed_ = true;
-  SetEnableFastbootdLogo(false); // logo not required on Wear
 }
 
 // Draw background frame on the screen.  Does not flip pages.