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

Merge "Fix issue #4999758: Disabling a system app should require..."

Browse Source
This commit is contained in:
Dianne Hackborn
2011-07-18 18:11:46 -07:00
committed by Android (Google) Code Review
parent 1840494bda f0b63c2c3e
commit 6ba9e021d4
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -2340,6 +2340,11 @@ found in the list of installed applications.</string>
<string name="app_install_location_title">Preferred install location</string>
<!-- Manage applications. application installation location summary -->
<string name="app_install_location_summary">Change the preferred installation location for new applications.</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=200] Manage applications, text for dialog when disabling apps -->
<string name="app_disable_dlg_text">Disabling a built-in application may cause other applications
to misbehave. Are you sure?</string>
<!-- [CHAR LIMIT=25] Services settings screen, setting option name for the user to go to the screen to view app storage use -->
<string name="storageuse_settings_title">Storage use</string>

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

@@ -147,6 +147,7 @@ public class InstalledAppDetails extends Fragment
private static final int DLG_CANNOT_CLEAR_DATA = DLG_BASE + 4;
private static final int DLG_FORCE_STOP = DLG_BASE + 5;
private static final int DLG_MOVE_FAILED = DLG_BASE + 6;
private static final int DLG_DISABLE = DLG_BASE + 7;
private Handler mHandler = new Handler() {
public void handleMessage(Message msg) {
@@ -754,6 +755,22 @@ public class InstalledAppDetails extends Fragment
.setMessage(msg)
.setNeutralButton(R.string.dlg_ok, null)
.create();
case DLG_DISABLE:
return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.app_disable_dlg_title))
.setIcon(android.R.drawable.ic_dialog_alert)
.setMessage(getActivity().getText(R.string.app_disable_dlg_text))
.setPositiveButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
// Disable the app
new DisableChanger(getOwner(), getOwner().mAppEntry.info,
PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER)
.execute((Object)null);
}
})
.setNegativeButton(R.string.dlg_cancel, null)
.create();
}
throw new IllegalArgumentException("unknown id " + id);
}
@@ -837,9 +854,13 @@ public class InstalledAppDetails extends Fragment
showDialogInner(DLG_FACTORY_RESET, 0);
} else {
if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
new DisableChanger(this, mAppEntry.info, mAppEntry.info.enabled ?
PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER
: PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).execute((Object)null);
if (mAppEntry.info.enabled) {
showDialogInner(DLG_DISABLE, 0);
} else {
new DisableChanger(this, mAppEntry.info,
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
.execute((Object)null);
}
} else {
uninstallPkg(packageName);
}