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

am b12b21a5: am b99e029d: Fix string for uninstall button for system apps.

Browse Source 
Merge commit 'b12b21a5b02468d601190de23f91675973ead44d' into kraken

* commit 'b12b21a5b02468d601190de23f91675973ead44d':
  Fix string for uninstall button for system apps.
This commit is contained in:
Suchi Amalapurapu
2010-04-22 21:06:31 -07:00
committed by Android Git Automerger
parent 830e4811e2 b12b21a5b0
commit 937dc855eb
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/InstalledAppDetails.java
View File

@@ -276,12 +276,13 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
boolean enabled = true; boolean enabled = true;
if (mUpdatedSysApp) { if (mUpdatedSysApp) {
mUninstallButton.setText(R.string.app_factory_reset); mUninstallButton.setText(R.string.app_factory_reset);
} else if ((mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0){
mUninstallButton.setText(R.string.uninstall_text);
} else { } else {
// Disable uninstall for system apps if ((mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0){
// Disable button for system applications.
enabled = false; enabled = false;
} }
mUninstallButton.setText(R.string.uninstall_text);
}
mUninstallButton.setEnabled(enabled); mUninstallButton.setEnabled(enabled);
if (enabled) { if (enabled) {
// Register listener // Register listener