Merge "screen_ui: Word-wrap menu headers."

am: 162b92323b

Change-Id: I93c959422c5b56a15875580159ecfc1a1d44087d

1 files changed, 5 insertions, 4 deletions

diff --git a/recovery.cpp b/recovery.cpp
index 9abb9341..6f62ff17 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -758,12 +758,13 @@ static bool wipe_data(Device* device) {
 }
 
 static bool prompt_and_wipe_data(Device* device) {
+  // Use a single string and let ScreenRecoveryUI handles the wrapping.
   const char* const headers[] = {
-    "Can't load Android system. Your data may be corrupt.",
-    "If you continue to get this message, you may need to",
-    "perform a factory data reset and erase all user data",
+    "Can't load Android system. Your data may be corrupt. "
+    "If you continue to get this message, you may need to "
+    "perform a factory data reset and erase all user data "
     "stored on this device.",
-    NULL
+    nullptr
   };
   const char* const items[] = {
     "Try again",