diff options
| author | Suchi Amalapurapu <asuchitra@google.com> | 2010-04-22 21:06:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-22 21:06:31 -0700 |
| commit | 937dc855eb59ef3defca16bb5e546c37fabdf721 (patch) | |
| tree | 085d8998dd9d6a76fdd6811436fb38fa4806b5fb /src | |
| parent | 830e4811e2a2d471ef50a179b2e2510ef037582e (diff) | |
| parent | b12b21a5b02468d601190de23f91675973ead44d (diff) | |
| download | packages_apps_Settings-937dc855eb59ef3defca16bb5e546c37fabdf721.zip packages_apps_Settings-937dc855eb59ef3defca16bb5e546c37fabdf721.tar.gz packages_apps_Settings-937dc855eb59ef3defca16bb5e546c37fabdf721.tar.bz2 | |
am b12b21a5: am b99e029d: Fix string for uninstall button for system apps.
Merge commit 'b12b21a5b02468d601190de23f91675973ead44d' into kraken
* commit 'b12b21a5b02468d601190de23f91675973ead44d':
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) { |