Merge "Prevent NPE when shrinking workspace" into honeycomb
diff --git a/res/layout-xlarge/all_apps_no_items_placeholder.xml b/res/layout-xlarge/all_apps_no_items_placeholder.xml
index f5ecdec..247870c 100644
--- a/res/layout-xlarge/all_apps_no_items_placeholder.xml
+++ b/res/layout-xlarge/all_apps_no_items_placeholder.xml
@@ -20,7 +20,7 @@
android:id="@+id/no_items_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center_vertical"
+ android:gravity="center"
android:paddingTop="2dip"
android:textColor="#FFFFFFFF"
@@ -29,7 +29,6 @@
android:shadowDx="0.0"
android:shadowDy="1.0"
android:shadowRadius="1.0"
- android:drawableLeft="@drawable/ic_no_applications"
android:drawablePadding="0dip"
android:maxLines="2"
diff --git a/res/values-es-rUS-xlarge/strings.xml b/res/values-es-rUS-xlarge/strings.xml
index 7c8b273..a433f4f 100644
--- a/res/values-es-rUS-xlarge/strings.xml
+++ b/res/values-es-rUS-xlarge/strings.xml
@@ -16,14 +16,10 @@
<!-- XL -->
<string name="wallpapers_temp_tab_text" msgid="1406600851510062325">"Ésta será la pestaña para los fondos de pantalla"</string>
<!-- XL -->
- <string name="all_apps_tab_apps" msgid="827864997519186499">"Google Apps"</string>
- <!-- XL -->
<string name="all_apps_no_downloads" msgid="6687010155766000796">"No se encontraron apps."</string>
<!-- XL -->
<string name="group_wallpapers" msgid="5356616257147378618">"Fondos de pantalla"</string>
<!-- XL -->
- <string name="all_apps_button_label" msgid="825988103463804114">"Google Apps"</string>
- <!-- XL -->
<string name="all_apps_home_button_label" msgid="4573985169183891042">"Pantalla principal"</string>
<!-- XL -->
<string name="delete_zone_label_workspace" msgid="7170653385628744300">"Eliminar"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d10441b..ef4f0bb 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -64,8 +64,7 @@
<string name="title_select_live_folder" msgid="3753447798805166749">"Избор директоријума"</string>
<string name="all_apps_button_label" msgid="2578400570124163469">"Apps"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Почетна"</string>
- <!-- no translation found for delete_zone_label_workspace (7153615831493049150) -->
- <skip />
+ <string name="delete_zone_label_workspace" msgid="7153615831493049150">"Уклони"</string>
<!-- no translation found for delete_zone_label_all_apps (6664588234817475108) -->
<skip />
<string name="menu_add" msgid="3065046628354640854">"Додај"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index e7f638e..63b2450 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -64,8 +64,7 @@
<string name="title_select_live_folder" msgid="3753447798805166749">"Виберіть папку"</string>
<string name="all_apps_button_label" msgid="2578400570124163469">"Прогр."</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Головна"</string>
- <!-- no translation found for delete_zone_label_workspace (7153615831493049150) -->
- <skip />
+ <string name="delete_zone_label_workspace" msgid="7153615831493049150">"Видалити"</string>
<!-- no translation found for delete_zone_label_all_apps (6664588234817475108) -->
<skip />
<string name="menu_add" msgid="3065046628354640854">"Додати"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index addea4b..f473880 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -70,8 +70,8 @@
<!-- All Apps pane -->
<!-- Message to show when there are no games [CHAR_LIMIT=25] -->
<string name="all_apps_no_games">No games found.</string>
- <!-- Message to show when there are no downloaded apps [CHAR_LIMIT=25] -->
- <string name="all_apps_no_downloads">No downloaded apps found.</string>
+ <!-- Message to show when there are no downloaded apps [CHAR_LIMIT=50] -->
+ <string name="all_apps_no_downloads">You have no downloaded applications.</string>
<!-- Customization Drawer -->
<!-- The format string for the dimensions of a widget in the drawer -->
diff --git a/src/com/android/launcher2/AllAppsPagedView.java b/src/com/android/launcher2/AllAppsPagedView.java
index ef9e3fa..64da1b4 100644
--- a/src/com/android/launcher2/AllAppsPagedView.java
+++ b/src/com/android/launcher2/AllAppsPagedView.java
@@ -511,7 +511,7 @@
layout.enableCenteredContent(true);
layout.removeAllViews();
layout.addViewToCellLayout(icon, -1, 0,
- new PagedViewCellLayout.LayoutParams(0, 0, 2, 1));
+ new PagedViewCellLayout.LayoutParams(0, 0, 4, 1));
}
}