Update disable dialog

Bug: 20826933
Change-Id: Ib84d3ba50ead2b71f62a3b163a5f5ba32a576c00

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6169fc9..6a09f59 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3243,14 +3243,14 @@
     <string name="app_install_location_summary">Change the preferred installation location for new apps</string>
     <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling apps -->
     <string name="app_disable_dlg_title">Disable built-in app?</string>
+    <!-- [CHAR LIMIT=30] Manage applications, label for option to disable app -->
+    <string name="app_disable_dlg_positive">Disable app</string>
     <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
-    <string name="app_disable_dlg_text">If you disable a built-in app, other apps
-        may misbehave.</string>
+    <string name="app_disable_dlg_text">If you disable this app, other apps may no longer function as intended.</string>
     <!-- [CHAR LIMIT=NONE] Manage applications, title for dialog when disabling updated apps -->
     <string name="app_special_disable_dlg_title">Delete data and disable app?</string>
     <!-- [CHAR LIMIT=NONE] Manage applications, text for dialog when disabling update apps -->
-    <string name="app_special_disable_dlg_text">If you disable a built-in app, other apps
-        may misbehave.  Your data will also be deleted.</string>
+    <string name="app_special_disable_dlg_text">If you disable this app, other apps may no longer function as intended.  Your data will also be deleted.</string>
     <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
     <string name="app_disable_notifications_dlg_title">Turn off notifications?</string>
     <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->

diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 6fd3d95..e78c697 100755 (executable)
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -560,9 +560,9 @@ public class InstalledAppDetails extends AppInfoBase
         switch (id) {
             case DLG_DISABLE:
                 return new AlertDialog.Builder(getActivity())
-                        .setTitle(getActivity().getText(R.string.app_disable_dlg_title))
                         .setMessage(getActivity().getText(R.string.app_disable_dlg_text))
-                        .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                        .setPositiveButton(R.string.app_disable_dlg_positive,
+                                new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
                                 // Disable the app
                                 new DisableChanger(InstalledAppDetails.this, mAppEntry.info,
@@ -574,9 +574,9 @@ public class InstalledAppDetails extends AppInfoBase
                         .create();
             case DLG_SPECIAL_DISABLE:
                 return new AlertDialog.Builder(getActivity())
-                        .setTitle(getActivity().getText(R.string.app_special_disable_dlg_title))
                         .setMessage(getActivity().getText(R.string.app_special_disable_dlg_text))
-                        .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() {
+                        .setPositiveButton(R.string.app_disable_dlg_positive,
+                                new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
                                 // Clear user data here
                                 uninstallPkg(mAppEntry.info.packageName,