commit 7f7d9b2f37a52805f3690d96347ac08d927256f9
author Tao Bao <tbao@google.com> Thu Aug 17 00:48:48 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 17 00:48:48 2017 +0000
tree 0bdd7028436ab3a83277768defcda03d68e4ab0f
parent f1397b597ab7c100e0ce00cebe27bf09bb1f4424
parent 228a2f2a375443022d567e127128cca0572de476

Merge "screen_ui: Fix a case that may truncate the last char." am: 2e99c38cfd am: 151126360e
am: 228a2f2a37

Change-Id: I5c672cbf0171be019f7240135f9cf6d26e68de9f

screen_ui.cpp

diff --git a/screen_ui.cpp b/screen_ui.cpp
index e056512..a025501 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -344,7 +344,8 @@
     y += DrawTextLines(x, y, HasThreeButtons() ? REGULAR_HELP : LONG_PRESS_HELP);
 
     SetColor(HEADER);
-    y += DrawWrappedTextLines(x, y, menu_headers_);
+    // Ignore kMenuIndent, which is not taken into account by text_cols_.
+    y += DrawWrappedTextLines(kMarginWidth, y, menu_headers_);
 
     SetColor(MENU);
     y += DrawHorizontalRule(y) + 4;