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/ApplicationInfo.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/ApplicationInfo.java')
-rw-r--r-- | src/com/android/launcher2/ApplicationInfo.java | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/com/android/launcher2/ApplicationInfo.java b/src/com/android/launcher2/ApplicationInfo.java index 3adea373e..1d948b738 100644 --- a/src/com/android/launcher2/ApplicationInfo.java +++ b/src/com/android/launcher2/ApplicationInfo.java @@ -59,9 +59,9 @@ class ApplicationInfo extends ItemInfo { ComponentName componentName; - static final int APP_FLAG = 1; - static final int GAME_FLAG = 2; - static final int DOWNLOADED_FLAG = 4; + static final int DOWNLOADED_FLAG = 1; + static final int UPDATED_SYSTEM_APP_FLAG = 2; + int flags = 0; ApplicationInfo() { @@ -83,17 +83,12 @@ class ApplicationInfo extends ItemInfo { int appFlags = pm.getApplicationInfo(packageName, 0).flags; if ((appFlags & android.content.pm.ApplicationInfo.FLAG_SYSTEM) == 0) { flags |= DOWNLOADED_FLAG; - } - if ((appFlags & android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) { - flags |= DOWNLOADED_FLAG; - } - firstInstallTime = pm.getPackageInfo(packageName, 0).firstInstallTime; - // TODO: Figure out how to determine what is a game - // If it's not a game, it's an app - if ((flags & GAME_FLAG) == 0) { - flags |= APP_FLAG; + if ((appFlags & android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) { + flags |= UPDATED_SYSTEM_APP_FLAG; + } } + firstInstallTime = pm.getPackageInfo(packageName, 0).firstInstallTime; } catch (NameNotFoundException e) { Log.d(TAG, "PackageManager.getApplicationInfo failed for " + packageName); } |