am d8c811d8: am b4b590d1: Merge "Update disable dialog" into mnc-dev

* commit 'd8c811d8b80d251630303afda518c8407424abae':
  Update disable dialog
This commit is contained in:
Jason Monk
2015-06-22 15:54:26 +00:00
committed by Android Git Automerger
2 changed files with 8 additions and 8 deletions

View File

@@ -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,