diff options
author | Patrick Dubroy <dubroy@google.com> | 2011-02-28 15:16:42 -0800 |
---|---|---|
committer | Patrick Dubroy <dubroy@google.com> | 2011-02-28 15:49:59 -0800 |
commit | cd953711fcbb6c8c6579fb7127e3c86103c0d409 (patch) | |
tree | 6f249706f2dc886b90611a68c3d6b6df2ea295d6 /src/com/android/launcher2/AllApps2D.java | |
parent | 60b753b4cfa709efa55e05cdcd62a993330f3684 (diff) | |
download | android_packages_apps_Trebuchet-cd953711fcbb6c8c6579fb7127e3c86103c0d409.tar.gz android_packages_apps_Trebuchet-cd953711fcbb6c8c6579fb7127e3c86103c0d409.tar.bz2 android_packages_apps_Trebuchet-cd953711fcbb6c8c6579fb7127e3c86103c0d409.zip |
Fix 3385675: Uninstall option available for system app
- when a system app is selected in all apps, don't show uninstall button
- if it's an updated system app, show "Uninstall update"
- Also, remove unused code for non-existent flag for games
Change-Id: I46753ee8d213b2ba1613b71ac1fe73d79786129c
Diffstat (limited to 'src/com/android/launcher2/AllApps2D.java')
-rw-r--r-- | src/com/android/launcher2/AllApps2D.java | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/com/android/launcher2/AllApps2D.java b/src/com/android/launcher2/AllApps2D.java index a9423be1f..1cbb99994 100644 --- a/src/com/android/launcher2/AllApps2D.java +++ b/src/com/android/launcher2/AllApps2D.java @@ -313,19 +313,9 @@ public class AllApps2D mVisibleAppsList.clear(); if (appType == AppType.ALL) { mVisibleAppsList.addAll(mAllAppsList); - } else { - int searchFlags = 0; - - if (appType == AppType.APP) { - searchFlags = ApplicationInfo.APP_FLAG; - } else if (appType == AppType.GAME) { - searchFlags = ApplicationInfo.GAME_FLAG; - } else if (appType == AppType.DOWNLOADED) { - searchFlags = ApplicationInfo.DOWNLOADED_FLAG; - } - + } else if (appType == AppType.DOWNLOADED) { for (ApplicationInfo info : mAllAppsList) { - if ((info.flags & searchFlags) != 0) { + if ((info.flags & ApplicationInfo.DOWNLOADED_FLAG) != 0) { mVisibleAppsList.add(info); } } |