From f14248310f7fc72227c933077dafbfb52f114d76 Mon Sep 17 00:00:00 2001
From: Yanting Yang <yantingyang@google.com>
Date: Wed, 30 Mar 2022 16:35:46 +0800
Subject: [PATCH] Update strings of clear app data dialog

Update body and positive button strings.

Bug: 219932186
Test: visual
Change-Id: I34f4be091d1e5a076de8ee7a2221a3b5c90747a4
---
 res/values/strings.xml                                      | 6 ++++--
 .../android/settings/applications/AppStorageSettings.java   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3d7cfdbad3b..acba8535560 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4758,11 +4758,13 @@
     <!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". -->
     <string name="clear_data_dlg_title">Delete app data?</string>
     <!-- Manage applications, individual application screen, confirmation dialog message. Displays when user selects to "Clear data". It warns the user of the consequences of clearing the data for an app. -->
-    <string name="clear_data_dlg_text">This app\u2019s data will be permanently deleted. This includes files, settings, databases, and other app data.</string>
-    <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
+    <string name="clear_data_dlg_text">This app\u2019s data, including files and settings, will be permanently deleted from this device</string>
+    <!-- Manage applications, individual application screen, confirmation dialog button. -->
     <string name="dlg_ok">OK</string>
     <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
     <string name="dlg_cancel">Cancel</string>
+    <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. [CHAR LIMIT=25] -->
+    <string name="dlg_delete">Delete</string>
     <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
     <string name="app_not_found_dlg_title"></string>
     <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 91eeace0fd3..c3dc3062bba 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -491,7 +491,8 @@ public class AppStorageSettings extends AppInfoWithHeader
                 return new AlertDialog.Builder(getActivity())
                         .setTitle(getActivity().getText(R.string.clear_data_dlg_title))
                         .setMessage(getActivity().getText(R.string.clear_data_dlg_text))
-                        .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                        .setPositiveButton(R.string.dlg_delete,
+                                new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
                                 // Clear user data here
                                 initiateClearUserData();