commit 199d541c8d5a62551e7d78559824a52270e8cb13
author Michael Jurka <mikejurka@google.com> Thu Apr 18 16:43:53 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 18 16:43:54 2013 +0000
tree 6b480e97a29a81b9e82a26a0b9f22302b796fca6
parent ac9cf013a57a673189253f03ace51481a930bf9a
parent 74f053757701bcb897fb2ec11f8e2aa2d11491e6

Merge "Trim widget names" into jb-mr2-dev

res/values-es-rUS/strings.xml

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 4c9be46..5bbde7c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -93,10 +93,10 @@
     <string name="workspace_scroll_format" msgid="1704767047951143301">"Pantalla principal %1$d de %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Página de aplicaciones %1$d de %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Página de widgets %1$d de %2$d"</string>
-    <string name="workspace_cling_title" msgid="738396473989890567">"Ponte cómodo."</string>
+    <string name="workspace_cling_title" msgid="738396473989890567">"Para tu comodidad"</string>
     <string name="workspace_cling_move_item" msgid="791013895761065070">"Puedes colocar tus aplicaciones favoritas aquí."</string>
     <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Para ver todas las aplicaciones, toca el círculo."</string>
-    <string name="all_apps_cling_title" msgid="2559734712581447107">"Elige algunas aplicaciones."</string>
+    <string name="all_apps_cling_title" msgid="2559734712581447107">"Elige algunas aplicaciones"</string>
     <string name="all_apps_cling_add_item" msgid="5665035103260318891">"Mantén presionada la aplicación que deseas agregar a tu pantalla principal."</string>
     <string name="folder_cling_title" msgid="4308949882377840953">"Organiza tus aplicaciones en carpetas."</string>
     <string name="folder_cling_move_item" msgid="270598675060435169">"Para mover una aplicación, tócala &amp; mantenla presionada."</string>

src/com/android/launcher2/PagedViewWidget.java

diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/android/launcher2/PagedViewWidget.java
index bb5827a..1336c7a 100644
--- a/src/com/android/launcher2/PagedViewWidget.java
+++ b/src/com/android/launcher2/PagedViewWidget.java
@@ -112,7 +112,6 @@
         if (maxWidth > -1) {
             image.setMaxWidth(maxWidth);
         }
-        image.setContentDescription(info.label);
         final TextView name = (TextView) findViewById(R.id.widget_name);
         name.setText(info.label);
         final TextView dims = (TextView) findViewById(R.id.widget_dims);
@@ -130,7 +129,6 @@
         mInfo = info;
         CharSequence label = info.loadLabel(pm);
         final ImageView image = (ImageView) findViewById(R.id.widget_preview);
-        image.setContentDescription(label);
         final TextView name = (TextView) findViewById(R.id.widget_name);
         name.setText(label);
         final TextView dims = (TextView) findViewById(R.id.widget_dims);