commit 1a4f9e37ddf7c6d3533a638baf23b2c8ec1c39a4
author Tao Bao <tbao@google.com> Thu Jul 13 20:50:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 20:50:17 2017 +0000
tree 1074c0402a50da4f8a5a4b07475f4b75989453ac
parent c33abb73bcbcb93ccaa163ce00f5deacbc92b481
parent 762c42d6f6e9aa56738efc1fca72298f0284cd9f

Merge "Fix the missing char when showing recovery logs." am: 8155a8ba74 am: c61bbe158e
am: 762c42d6f6

Change-Id: I8dd98865f38e0cc328f5a908a2c7c092d73e3a61

screen_ui.cpp

diff --git a/screen_ui.cpp b/screen_ui.cpp
index d9574d8..8f792f1 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -301,15 +301,15 @@
   gr_color(0, 0, 0, 255);
   gr_clear();
 
-  static constexpr int TEXT_INDENT = 4;
-  int x = TEXT_INDENT + kMarginWidth;
   int y = kMarginHeight;
   if (show_menu) {
-    std::string recovery_fingerprint =
-        android::base::GetProperty("ro.bootimage.build.fingerprint", "");
+    static constexpr int kMenuIndent = 4;
+    int x = kMarginWidth + kMenuIndent;
 
     SetColor(INFO);
     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, ":")) {
       y += DrawTextLine(x, y, chunk.c_str(), false);
     }
@@ -343,7 +343,7 @@
   size_t count = 0;
   for (int ty = gr_fb_height() - kMarginHeight - char_height_; ty >= y && count < text_rows_;
        ty -= char_height_, ++count) {
-    DrawTextLine(x, ty, text_[row], false);
+    DrawTextLine(kMarginWidth, ty, text_[row], false);
     --row;
     if (row < 0) row = text_rows_ - 1;
   }