diff options
| author | Suchi Amalapurapu <asuchitra@google.com> | 2010-04-22 21:04:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-22 21:04:01 -0700 |
| commit | b12b21a5b02468d601190de23f91675973ead44d (patch) | |
| tree | 7ef1cf89e8198b4ac3202230e3c191a0edaec13f /src | |
| parent | a6bde3c9cd0db85538ff6166cb35f626c303352b (diff) | |
| parent | b99e029db14ae276a47da39da9378b6af9aef403 (diff) | |
| download | packages_apps_Settings-b12b21a5b02468d601190de23f91675973ead44d.zip packages_apps_Settings-b12b21a5b02468d601190de23f91675973ead44d.tar.gz packages_apps_Settings-b12b21a5b02468d601190de23f91675973ead44d.tar.bz2 | |
am b99e029d: Fix string for uninstall button for system apps.
Merge commit 'b99e029db14ae276a47da39da9378b6af9aef403' into froyo-plus-aosp
* commit 'b99e029db14ae276a47da39da9378b6af9aef403':
Fix string for uninstall button for system apps.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/InstalledAppDetails.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/settings/InstalledAppDetails.java b/src/com/android/settings/InstalledAppDetails.java index a6496e7..e050dc5 100644 --- a/src/com/android/settings/InstalledAppDetails.java +++ b/src/com/android/settings/InstalledAppDetails.java @@ -276,11 +276,12 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene boolean enabled = true; if (mUpdatedSysApp) { mUninstallButton.setText(R.string.app_factory_reset); - } else if ((mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0){ - mUninstallButton.setText(R.string.uninstall_text); } else { - // Disable uninstall for system apps - enabled = false; + if ((mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0){ + // Disable button for system applications. + enabled = false; + } + mUninstallButton.setText(R.string.uninstall_text); } mUninstallButton.setEnabled(enabled); if (enabled) { |