Merge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 2319638..63a0972 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -91,7 +91,7 @@
<string name="default_scroll_format" msgid="4057140866420001240">"ገጽ %1$d የ %2$d"</string>
<string name="workspace_scroll_format" msgid="1704767047951143301">"መነሻ ማያ ገጽ %1$d ከ%2$d"</string>
<string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Appsገጽ %1$d የ %2$d"</string>
- <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"ምግብሮች ገጽ %1$d የ %2$d"</string>
+ <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"ፍርግሞች ገጽ %1$d የ %2$d"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"እቤትህ እንዳለህ ሆነሀ ዘና በል"</string>
<string name="workspace_cling_move_item" msgid="791013895761065070">"ተወዳጅ መተግበሪያዎችህን እዚህ ላይ ማስቀመጥ ትችላለህ፡፡"</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"ሁሉንም መተግበሪያዎችህን ለማየት፣ ክቡን ንካ::"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6ed84db..dc1f72f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -19,13 +19,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Barra d\'execució ràpida"</string>
- <string name="home" msgid="5921706419368316758">"Pàgina d\'inici"</string>
+ <string name="application_name" msgid="8424725141379931883">"Menú d\'aplicacions"</string>
+ <string name="home" msgid="5921706419368316758">"Casa"</string>
<string name="uid_name" msgid="3371120195364560632">"Aplicacions principals d\'Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
<string name="chooser_wallpaper" msgid="6063168087625352235">"Selecciona fons de pantalla de"</string>
- <string name="wallpaper_instructions" msgid="4215640646180727542">"Defineix l\'empaperat"</string>
- <string name="pick_wallpaper" msgid="5630222540525626723">"Empaperats"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"Estableix el fons de pantalla"</string>
+ <string name="pick_wallpaper" msgid="5630222540525626723">"Fons de pantalla"</string>
<string name="activity_not_found" msgid="217823393239365967">"L\'aplicació no s\'ha instal·lat."</string>
<string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
<string name="long_press_widget_to_add" msgid="7395697462851217506">"Mantén premut un widget per triar-lo."</string>
@@ -40,7 +40,7 @@
<string name="group_applications" msgid="2103752818818161976">"Aplicacions"</string>
<string name="group_shortcuts" msgid="9133529424900391877">"Dreceres"</string>
<string name="group_widgets" msgid="6704978494073105844">"Widgets"</string>
- <string name="group_wallpapers" msgid="1568191644272224858">"Empaperats"</string>
+ <string name="group_wallpapers" msgid="1568191644272224858">"Fons de pantalla"</string>
<string name="completely_out_of_space" msgid="1759078539443491182">"No queda espai a les pantalles d\'inici."</string>
<string name="out_of_space" msgid="8365249326091984698">"Ja no queda espai en aquesta pantalla Inici."</string>
<string name="hotseat_out_of_space" msgid="6304886797358479361">"No queda espai al hotseat."</string>
@@ -92,8 +92,8 @@
<string name="workspace_scroll_format" msgid="1704767047951143301">"Pantalla d\'inici %1$d de %2$d"</string>
<string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Pàgina d\'aplicacions %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">"Posa\'t còmode"</string>
- <string name="workspace_cling_move_item" msgid="791013895761065070">"Pots posar les teves aplicacions preferides aquí."</string>
+ <string name="workspace_cling_title" msgid="738396473989890567">"Personalitza el teu escriptori"</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"Ací pots col·locar les teves aplicacions preferides."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Per veure totes les aplicacions, toca el cercle."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Tria algunes aplicacions"</string>
<string name="all_apps_cling_add_item" msgid="5665035103260318891">"Per afegir una aplicació a la pantalla d\'inici, mantén-la premuda."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9f48ef2..abdb30a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -92,11 +92,11 @@
<string name="workspace_scroll_format" msgid="1704767047951143301">"صفحهٔ اصلی %1$d از %2$d"</string>
<string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"صفحه برنامهها %1$d از %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"صفحه ابزارکها %1$d از %2$d"</string>
- <string name="workspace_cling_title" msgid="738396473989890567">"احساس کنید در خانه هستید"</string>
- <string name="workspace_cling_move_item" msgid="791013895761065070">"برنامههای مورد دلخواه خود را میتوانید در اینجا قرار دهید."</string>
+ <string name="workspace_cling_title" msgid="738396473989890567">"منزل خودتان است"</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"میتوانید برنامههای دلخواه خود را اینجا بگذارید."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"برای مشاهدهٔ تمام برنامههای خود، حلقه را لمس کنید."</string>
- <string name="all_apps_cling_title" msgid="2559734712581447107">"انتخاب چند برنامه"</string>
- <string name="all_apps_cling_add_item" msgid="5665035103260318891">"برای افزودن یک برنامه به صفحهٔ اصلی خود، آن را لمس کرده و نگه دارید."</string>
+ <string name="all_apps_cling_title" msgid="2559734712581447107">"چندتا برنامه انتخاب کنید"</string>
+ <string name="all_apps_cling_add_item" msgid="5665035103260318891">"اگر میخواهید برنامهای را به صفحهٔ اصلی خود اضافه کنید، آن را لمس کرده و نگه دارید."</string>
<string name="folder_cling_title" msgid="4308949882377840953">"برنامههای خود را با پوشهها سازماندهی کنید"</string>
<string name="folder_cling_move_item" msgid="270598675060435169">"برای جابجا کردن یک برنامه، آن را لمس کرده و نگهدارید."</string>
<string name="folder_cling_create_folder" msgid="8352867485656129478">"برای ایجاد یک پوشه جدید در صفحهٔ اصلی خود، یک برنامه را در بالای دیگری قرار دهید."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7e29730..a049d2e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -61,7 +61,7 @@
<string name="accessibility_voice_search_button" msgid="3938249215065842475">"音声検索"</string>
<string name="accessibility_all_apps_button" msgid="8803738611398979849">"アプリ"</string>
<string name="accessibility_delete_button" msgid="3628162007991023603">"削除"</string>
- <string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"アップデートをアンインストール"</string>
+ <string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"アップデートを削除"</string>
<string name="menu_add" msgid="3065046628354640854">"追加"</string>
<string name="menu_manage_apps" msgid="2308685199463588895">"アプリの管理"</string>
<string name="menu_wallpaper" msgid="5837429080911269832">"壁紙"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 676edcb..c09d328 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -68,7 +68,7 @@
<string name="menu_search" msgid="4826514464423239041">"Tafuta"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Arifa"</string>
<string name="menu_settings" msgid="3946232973327980394">"Mipangilio ya mfumo"</string>
- <string name="menu_help" msgid="4901160661634590633">"Msaada"</string>
+ <string name="menu_help" msgid="4901160661634590633">"Usaidizi"</string>
<string name="cab_menu_delete_app" msgid="4089398025537640349">"Sanidua programu"</string>
<string name="cab_menu_app_info" msgid="914548323652698884">"Maelezo ya programu"</string>
<string name="cab_app_selection_text" msgid="6378522164293415735">"Programu 1 imechaguliwa"</string>
@@ -95,7 +95,7 @@
<string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Ukurasa wa programu %1$d ya %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Ukurasa wa wijeti %1$d ya %2$d"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"Jisikie huru"</string>
- <string name="workspace_cling_move_item" msgid="791013895761065070">"Unaweza kuweka prog zako uzipendazo hapa."</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"Unaweza kuweka programu zako uzipendazo hapa."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Kutazama programu zako zote, gusa duara."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Chagua programu kadhaa"</string>
<string name="all_apps_cling_add_item" msgid="5665035103260318891">"Ili kuongeza programu kwa skrini yako ya Nyumbani, iguse na uishikilie."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5031ea9..5cb330c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -95,7 +95,7 @@
<string name="workspace_cling_title" msgid="738396473989890567">"Влаштовуйтеся зручніше"</string>
<string name="workspace_cling_move_item" msgid="791013895761065070">"Тут можна розмістити вибрані програми."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Щоб побачити всі свої програми, торкніться кола."</string>
- <string name="all_apps_cling_title" msgid="2559734712581447107">"Виберіть декілька програм"</string>
+ <string name="all_apps_cling_title" msgid="2559734712581447107">"Виберіть програми"</string>
<string name="all_apps_cling_add_item" msgid="5665035103260318891">"Щоб додати програму на головний екран, торкніться й утримуйте її."</string>
<string name="folder_cling_title" msgid="4308949882377840953">"Організовуйте програми за допомогою папок"</string>
<string name="folder_cling_move_item" msgid="270598675060435169">"Щоб перемістити програму, торкніться й утримуйте її."</string>
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index b717261..5580381 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -449,8 +449,10 @@
if (mMaxAppCellCountX > -1) {
maxCellCountX = Math.min(maxCellCountX, mMaxAppCellCountX);
}
+ // Temp hack for now: only use the max cell count Y for widget layout
+ int maxWidgetCellCountY = maxCellCountY;
if (mMaxAppCellCountY > -1) {
- maxCellCountY = Math.min(maxCellCountY, mMaxAppCellCountY);
+ maxWidgetCellCountY = Math.min(maxWidgetCellCountY, mMaxAppCellCountY);
}
// Now that the data is ready, we can calculate the content width, the number of cells to
@@ -466,6 +468,7 @@
// Force a measure to update recalculate the gaps
int widthSpec = MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.AT_MOST);
int heightSpec = MeasureSpec.makeMeasureSpec(getMeasuredHeight(), MeasureSpec.AT_MOST);
+ mWidgetSpacingLayout.calculateCellCount(width, height, maxCellCountX, maxWidgetCellCountY);
mWidgetSpacingLayout.measure(widthSpec, heightSpec);
mContentWidth = mWidgetSpacingLayout.getContentWidth();