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 /res | |
| 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 'res')
| -rw-r--r-- | res/layout-xlarge-land/all_apps_tabbed.xml | 1 | ||||
| -rw-r--r-- | res/layout-xlarge-port/all_apps_tabbed.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml index d03a57158..850a3c352 100644 --- a/res/layout-xlarge-land/all_apps_tabbed.xml +++ b/res/layout-xlarge-land/all_apps_tabbed.xml @@ -53,7 +53,6 @@ </FrameLayout> <com.android.launcher2.DeleteZone android:id="@+id/all_apps_delete_zone" - android:text="@string/delete_zone_label_all_apps" android:drawablePadding="@dimen/delete_zone_drawable_padding" android:drawableLeft="@drawable/delete_zone_selector" android:layout_width="wrap_content" diff --git a/res/layout-xlarge-port/all_apps_tabbed.xml b/res/layout-xlarge-port/all_apps_tabbed.xml index 269fa1275..f38caf680 100644 --- a/res/layout-xlarge-port/all_apps_tabbed.xml +++ b/res/layout-xlarge-port/all_apps_tabbed.xml @@ -53,7 +53,6 @@ </FrameLayout> <com.android.launcher2.DeleteZone android:id="@+id/all_apps_delete_zone" - android:text="@string/delete_zone_label_all_apps" android:drawablePadding="@dimen/delete_zone_drawable_padding" android:drawableLeft="@drawable/delete_zone_selector" android:layout_width="wrap_content" diff --git a/res/values/strings.xml b/res/values/strings.xml index 6dcaa5748..389fcca38 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -149,6 +149,10 @@ device. [CHAR_LIMIT=30]--> <string name="delete_zone_label_all_apps">Uninstall</string> + <!-- Label for trash icon in All Apps, when an updated system app is selected. The update will + be uninstalled. [CHAR_LIMIT=30] --> + <string name="delete_zone_label_all_apps_system_app">Uninstall update</string> + <!-- Menus items: --> <skip /> <!-- Verb, menu item used to add an item on the desktop --> |