Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bccf8f56 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11078623 from 610a9fe9 to 24Q1-release 

Change-Id: I07241fd502ac99833c2aa038b48e4cb76a1f5f90
parents 135504a2 610a9fe9

fastboot/fastboot.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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);

  }

recovery_main.cpp

+0 −2
Original line number Diff line number Diff line
@@ -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) {

recovery_ui/screen_ui.cpp

+1 −9
Original line number Diff line number Diff line
@@ -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.

recovery_ui/wear_ui.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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.