commit 9e397d9b4ef7d69caf7063a05e9922ea5d1adc5a
author Nolen Johnson <johnsonnolen@gmail.com> Sun Apr 12 14:13:31 2020 -0400
committer Tim Zimmermann <tim@linux4.de> Tue Mar 05 06:14:35 2024 +0100
tree cba4de33ce14072dd2775d8d7ae4b96ddba1a293
parent 24a5c63ad861e09171b336c8d6cc30a145b3f4a3

recovery_ui: Tell the user they're actually formatting

* TWRP has given user the sentiment that "Wiping data",
  and "Factory Reset" both imply the exclusion of
  files in `/data/media/0` (/sdcard), whereas both AOSP
  (and Lineage Recovery by proxy) format the partitions.

Change-Id: I36c5a59552d7d538a05762ca262e42dc78a1deac

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index af2d6b9..918e661 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -170,8 +170,8 @@
 }
 
 static bool ask_to_wipe_data(Device* device) {
-  std::vector<std::string> headers{ "Wipe all user data?", "  THIS CAN NOT BE UNDONE!" };
-  std::vector<std::string> items{ " Cancel", " Factory data reset" };
+  std::vector<std::string> headers{ "Format user data?", "This includes internal storage.", "THIS CANNOT BE UNDONE!" };
+  std::vector<std::string> items{ " Cancel", " Format data" };
 
   size_t chosen_item = device->GetUI()->ShowMenu(
       headers, items, 0, true,
@@ -458,7 +458,7 @@
       case Device::WIPE_CACHE: {
         save_current_log = true;
         std::function<bool()> confirm_func = [&device]() {
-          return yes_no(device, "Wipe cache?", "  THIS CAN NOT BE UNDONE!");
+          return yes_no(device, "Format cache?", "  THIS CAN NOT BE UNDONE!");
         };
         WipeCache(ui, ui->IsTextVisible() ? confirm_func : nullptr);
         if (!ui->IsTextVisible()) return Device::NO_ACTION;
@@ -468,7 +468,7 @@
       case Device::WIPE_SYSTEM: {
         save_current_log = true;
         std::function<bool()> confirm_func = [&device]() {
-          return yes_no(device, "Wipe system?", "  THIS CAN NOT BE UNDONE!");
+          return yes_no(device, "Format system?", "  THIS CAN NOT BE UNDONE!");
         };
         WipeSystem(ui, ui->IsTextVisible() ? confirm_func : nullptr);
         if (!ui->IsTextVisible()) return Device::NO_ACTION;

recovery_ui/device.cpp

diff --git a/recovery_ui/device.cpp b/recovery_ui/device.cpp
index 38a2551..0e96b1e 100644
--- a/recovery_ui/device.cpp
+++ b/recovery_ui/device.cpp
@@ -53,9 +53,9 @@
 
 static std::vector<std::string> g_wipe_header{ "Factory reset" };
 static std::vector<menu_action_t> g_wipe_actions{
-  { "Wipe data/factory reset", Device::WIPE_DATA },
-  { "Wipe cache partition", Device::WIPE_CACHE },
-  { "Wipe system partition", Device::WIPE_SYSTEM },
+  { "Format data/factory reset", Device::WIPE_DATA },
+  { "Format cache partition", Device::WIPE_CACHE },
+  { "Format system partition", Device::WIPE_SYSTEM },
 };
 
 static std::vector<std::string> g_update_header{ "Apply update" };