From 6acc0cf3cdf3e47feb5a9c99adf4e732bfec9f2b Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Wed, 7 Mar 2018 13:19:52 -0800
Subject: [PATCH] Update string: clear data -> clear storage

Change-Id: I710f7b95a53e5437d895ff920f3cce7aa4c5a6cf
Fixes: 34515307
Test: visual
---
 res/values/strings.xml                                 | 10 +++-------
 .../settings/applications/AppStorageSettings.java      |  3 +--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 45d6e9cf6ac..9b4ba155a22 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3786,8 +3786,8 @@
     <string name="disable_text">Disable</string>
     <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to re-enable an existing application. -->
     <string name="enable_text">Enable</string>
-    <!-- Manage applications, individual application info screen, button label under Storage heading. Button to clear all data associated with tis app (for exampel, remove all cached emails for an Email app) -->
-    <string name="clear_user_data_text">Clear data</string>
+    <!-- Manage applications, individual application info screen, button label under Storage heading. Button to clear all data associated with tis app (for example, remove all cached emails for an Email app) -->
+    <string name="clear_user_data_text">Clear storage</string>
     <!-- Manage applications, restore updated system application to factory version -->
     <string name="app_factory_reset">Uninstall updates</string>
     <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app is set as a default for some actions. -->
@@ -3883,12 +3883,8 @@
     <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. -->
     <string name="app_not_found_dlg_text"> The app wasn\u2019t found in the list of installed apps.</string>
-    <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
-    <string name="clear_data_failed">Couldn\u2019t clear app data.</string>
-    <!-- Manage applications, title for dialog if clear data fails-->
-    <string name="clear_failed_dlg_title">Clear data</string>
     <!-- Manage applications, text for dialog if clear data fails-->
-    <string name="clear_failed_dlg_text">Couldn\u2019t clear data for app.</string>
+    <string name="clear_failed_dlg_text">Couldn\u2019t clear storage for app.</string>
     <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
     <string name="security_settings_desc" product="tablet">This app can access the following on your tablet:</string>
     <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index ff036bbd707..7382d201103 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -28,7 +28,6 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.Loader;
-import android.content.UriPermission;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageDataObserver;
 import android.content.pm.PackageManager;
@@ -487,7 +486,7 @@ public class AppStorageSettings extends AppInfoWithHeader
                         .create();
             case DLG_CANNOT_CLEAR_DATA:
                 return new AlertDialog.Builder(getActivity())
-                        .setTitle(getActivity().getText(R.string.clear_failed_dlg_title))
+                        .setTitle(getActivity().getText(R.string.clear_user_data_text))
                         .setMessage(getActivity().getText(R.string.clear_failed_dlg_text))
                         .setNeutralButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {