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

Commit 762c42d6 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Fix the missing char when showing recovery logs." am: 8155a8ba 

am: c61bbe15

Change-Id: Ic38f2132b05642ff8f5e00745fc1a0ac001d9e27
parents 04e1d6eb c61bbe15

screen_ui.cpp

+5 −5
Original line number Original line Diff line number Diff line
@@ -301,15 +301,15 @@ void ScreenRecoveryUI::draw_screen_locked() { 
  gr_color(0, 0, 0, 255);

  gr_color(0, 0, 0, 255);

  gr_clear();

  gr_clear();





  static constexpr int TEXT_INDENT = 4;

  int x = TEXT_INDENT + kMarginWidth;

  int y = kMarginHeight;

  int y = kMarginHeight;

  if (show_menu) {

  if (show_menu) {

    std::string recovery_fingerprint =

    static constexpr int kMenuIndent = 4;

        android::base::GetProperty("ro.bootimage.build.fingerprint", "");

    int x = kMarginWidth + kMenuIndent;





    SetColor(INFO);

    SetColor(INFO);

    y += DrawTextLine(x, y, "Android Recovery", true);

    y += DrawTextLine(x, y, "Android Recovery", true);

    std::string recovery_fingerprint =

        android::base::GetProperty("ro.bootimage.build.fingerprint", "");

    for (const auto& chunk : android::base::Split(recovery_fingerprint, ":")) {

    for (const auto& chunk : android::base::Split(recovery_fingerprint, ":")) {

      y += DrawTextLine(x, y, chunk.c_str(), false);

      y += DrawTextLine(x, y, chunk.c_str(), false);

    }

    }
@@ -343,7 +343,7 @@ void ScreenRecoveryUI::draw_screen_locked() { 
  size_t count = 0;

  size_t count = 0;

  for (int ty = gr_fb_height() - kMarginHeight - char_height_; ty >= y && count < text_rows_;

  for (int ty = gr_fb_height() - kMarginHeight - char_height_; ty >= y && count < text_rows_;

       ty -= char_height_, ++count) {

       ty -= char_height_, ++count) {

    DrawTextLine(x, ty, text_[row], false);

    DrawTextLine(kMarginWidth, ty, text_[row], false);

    --row;

    --row;

    if (row < 0) row = text_rows_ - 1;

    if (row < 0) row = text_rows_ - 1;

  }

  }