diff options
| author | Patrick Dubroy <dubroy@google.com> | 2011-02-28 16:06:22 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-28 16:06:22 -0800 |
| commit | c8c80b0b42db7ee604af6ae89e67aede3c404d7b (patch) | |
| tree | bc8fc39cc1d557c0d308ad5952b39daacb547229 /res | |
| parent | a391a680ccc5da206c166e262eaf3e2854ffc944 (diff) | |
| parent | cd953711fcbb6c8c6579fb7127e3c86103c0d409 (diff) | |
| download | android_packages_apps_Trebuchet-c8c80b0b42db7ee604af6ae89e67aede3c404d7b.tar.gz android_packages_apps_Trebuchet-c8c80b0b42db7ee604af6ae89e67aede3c404d7b.tar.bz2 android_packages_apps_Trebuchet-c8c80b0b42db7ee604af6ae89e67aede3c404d7b.zip | |
Merge "Fix 3385675: Uninstall option available for system app"
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 --> |