PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update disable dialog" into mnc-dev

Browse Source
This commit is contained in:
Jason Monk
2015-06-22 14:55:11 +00:00
committed by Android (Google) Code Review
parent 5a6d17c8cd 53a5d7ff2c
commit b4b590d13f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -3243,14 +3243,14 @@
<string name="app_install_location_summary">Change the preferred installation location for new apps</string> <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 --> <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling apps -->
<string name="app_disable_dlg_title">Disable built-in app?</string> <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 --> <!-- [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 <string name="app_disable_dlg_text">If you disable this app, other apps may no longer function as intended.</string>
may misbehave.</string>
<!-- [CHAR LIMIT=NONE] Manage applications, title for dialog when disabling updated apps --> <!-- [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> <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 --> <!-- [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 <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>
may misbehave. Your data will also be deleted.</string>
<!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app --> <!-- [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> <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 --> <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->

8
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -560,9 +560,9 @@ public class InstalledAppDetails extends AppInfoBase
switch (id) { switch (id) {
case DLG_DISABLE: case DLG_DISABLE:
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.app_disable_dlg_title))
.setMessage(getActivity().getText(R.string.app_disable_dlg_text)) .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) { public void onClick(DialogInterface dialog, int which) {
// Disable the app // Disable the app
new DisableChanger(InstalledAppDetails.this, mAppEntry.info, new DisableChanger(InstalledAppDetails.this, mAppEntry.info,
@@ -574,9 +574,9 @@ public class InstalledAppDetails extends AppInfoBase
.create(); .create();
case DLG_SPECIAL_DISABLE: case DLG_SPECIAL_DISABLE:
return new AlertDialog.Builder(getActivity()) 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)) .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) { public void onClick(DialogInterface dialog, int which) {
// Clear user data here // Clear user data here
uninstallPkg(mAppEntry.info.packageName, uninstallPkg(mAppEntry.info.packageName,