Merge 4.0.3

Conflicts:
	res/values/strings.xml
	src/com/android/launcher2/AppsCustomizePagedView.java
	src/com/android/launcher2/AppsCustomizeTabHost.java
	src/com/android/launcher2/Launcher.java
	src/com/android/launcher2/PagedView.java
	src/com/android/launcher2/SearchDropTargetBar.java
	src/com/android/launcher2/Workspace.java

Change-Id: Ia26c63bbf28b790c06f298c65fb48c79f49dc897

1 files changed, 28 insertions, 18 deletions

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index bccd8907b..79b74cc27 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -21,21 +21,21 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="uid_name" msgid="3371120195364560632">"I-Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
-    <string name="chooser_wallpaper" msgid="5988031014201479733">"Khetha iphephadonga kusuka"</string>
+    <string name="chooser_wallpaper" msgid="6063168087625352235">"Khetha iphephalodonga kwi"</string>
     <string name="wallpaper_instructions" msgid="4215640646180727542">"Hlela iphephadonga"</string>
     <string name="pick_wallpaper" msgid="5630222540525626723">"Amaphephadonga"</string>
-    <string name="activity_not_found" msgid="5591731020063337696">"Uhlelo lokusebenza alufakiwe."</string>
+    <string name="activity_not_found" msgid="217823393239365967">"I-App ayifakiwe."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Amawijethi"</string>
-    <string name="long_press_widget_to_add" msgid="8915177487173521501">"Thinta &amp; bamba ukuthatha iwijethi"</string>
+    <string name="long_press_widget_to_add" msgid="7395697462851217506">"Thinta &amp; bamba ukuthatha iwijethi"</string>
     <string name="market" msgid="2652226429823445833">"Thenga"</string>
-    <string name="external_drop_widget_error" msgid="4976816434597126575">"Ayikwazanga ukuwisa intwana kwiskrini sasekhaya"</string>
-    <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Khetha iwijethi oyidalayo"</string>
+    <string name="external_drop_widget_error" msgid="127440783198670829">"Ayikwazanga ukubeka into kulesi sikrini sasekhaya."</string>
+    <string name="external_drop_widget_pick_title" msgid="7040647073452295370">"Khetha i-wijethi ongayidala"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Igama lefolda"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Qamba kabusha ifolda"</string>
     <string name="rename_action" msgid="6016003384693240896">"KULUNGILE"</string>
     <string name="cancel_action" msgid="3811860427489435048">"Khansela"</string>
     <string name="menu_item_add_item" msgid="6233177331075781114">"Faka kwisikrini saseKhaya"</string>
-    <string name="group_applications" msgid="4118484163419674240">"Izinhlelo zokusebenza"</string>
+    <string name="group_applications" msgid="2103752818818161976">"Izinsiza"</string>
     <string name="group_shortcuts" msgid="9133529424900391877">"Izinqamuleli"</string>
     <string name="group_widgets" msgid="6704978494073105844">"Izinqunjwana"</string>
     <string name="group_wallpapers" msgid="1568191644272224858">"Amaphephadonga"</string>
@@ -45,7 +45,7 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"Isinqamuleli \"<xliff:g id="NAME">%s</xliff:g>\" sikhishiwe."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"Isinqamuleli \"<xliff:g id="NAME">%s</xliff:g>\" sivele sikhona"</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Khetha isinqamuleli"</string>
-    <string name="title_select_application" msgid="8031072293115454221">"Khetha uhlelo lokusebenza"</string>
+    <string name="title_select_application" msgid="1793455815754848652">"Khetha i-app"</string>
     <string name="all_apps_button_label" msgid="2578400570124163469">"Izinhlelo zokusebenza"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Ekhaya"</string>
     <string name="delete_zone_label_workspace" msgid="7153615831493049150">"Khipha"</string>
@@ -55,7 +55,7 @@
     <string name="info_target_label" msgid="4019495079517426980">"Ulwazi lohlelo lokusebenza"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Sesha"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Ukusesha Ngezwi"</string>
-    <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Izinhlelo zokusebenza"</string>
+    <string name="accessibility_all_apps_button" msgid="8803738611398979849">"Izinsiza"</string>
     <string name="accessibility_delete_button" msgid="3628162007991023603">"Susa"</string>
     <string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Khipha isibuyekezo"</string>
     <string name="menu_add" msgid="3065046628354640854">"Engeza"</string>
@@ -65,31 +65,41 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Izaziso"</string>
     <string name="menu_settings" msgid="3946232973327980394">"Izilungiselelo Zendlela Yokusebenza"</string>
     <string name="menu_help" msgid="4901160661634590633">"Usizo"</string>
-    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Khipha uhlelo lokusebenza"</string>
-    <string name="cab_menu_app_info" msgid="5180426909324882018">"Imininingwane yohlelo lokusebenza"</string>
-    <string name="cab_app_selection_text" msgid="606113924828167756">"Kukhethwe uhlelo lokusebenza olungu-1"</string>
+    <string name="cab_menu_delete_app" msgid="4089398025537640349">"Khipha i-app"</string>
+    <string name="cab_menu_app_info" msgid="914548323652698884">"Imininingwane ye-App"</string>
+    <string name="cab_app_selection_text" msgid="6378522164293415735">"Kukhethwe i-app engu-1"</string>
     <string name="cab_widget_selection_text" msgid="962527270506951955">"kukhethwe iwijethi engu-1"</string>
     <string name="cab_folder_selection_text" msgid="8916111874189565067">"kukhethwe ifolda engu-1"</string>
     <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"kukhethwe isinqamuleli esingu-1"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"engeza izinqamuleli"</string>
-    <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Ivumela uhlelo lokusebenza ukufaka izinqamuleli ngaphandle kokungenela komsebenzisi."</string>
+    <string name="permdesc_install_shortcut" msgid="8634424803272077038">"Ivumela uhlelo lokusebenza ukufaka izinqamuleli ngaphandle kokungenela komsebenzisi."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"khipha izinqamuleli"</string>
-    <string name="permdesc_uninstall_shortcut" msgid="959972195916090900">"Ivumela uhlelo lokusebenza ukukhipha izinqamuleli ngaphandle kokungenela komsebenzisi."</string>
+    <string name="permdesc_uninstall_shortcut" msgid="7811223557950931994">"Ivumela uhlelo lokusebenza ukukhipha izinqamuleli ngaphandle kokungenela komsebenzisi."</string>
     <string name="permlab_read_settings" msgid="3452408290738106747">"funda izilungiselelo zaseKhaya nezinqamuleli"</string>
-    <string name="permdesc_read_settings" msgid="8377434937176025492">"Ivumela uhlelo lokusebenza ukufunda izilungiselelo nezinqamuleli Ekhaya."</string>
+    <string name="permdesc_read_settings" msgid="1836104524215167383">"Ivumela uhlelo lokusebenza ukufunda izilungiselelo nezinqamuleli Ekhaya."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"bhala izilungiselelo zaseKhaya nezinqamuleli"</string>
-    <string name="permdesc_write_settings" msgid="1098648778383349818">"Ivumela izinhlelo ukushintsha izilungiselelo nezinqamuleli Ekhaya."</string>
+    <string name="permdesc_write_settings" msgid="6763846563231494591">"Ivumela izinhlelo ukushintsha izilungiselelo nezinqamuleli Ekhaya."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Inkinga yokulayisha iwijethi"</string>
-    <string name="uninstall_system_app_text" msgid="7488523163288397451">"Lolu uhlelo lokusebenza lwesistimu futhi alikwazi ukukhishwa."</string>
+    <string name="uninstall_system_app_text" msgid="6429814133777046491">"Lolu uhlelo lokusebenza lwesistimu futhi alikwazi ukukhishwa."</string>
     <string name="dream_name" msgid="2847171357608437154">"Isiqalisi se-Rocket"</string>
     <string name="folder_hint_text" msgid="8633351560105748141">"Ifolda Engenagama"</string>
+    <string name="default_scroll_format" msgid="4057140866420001240">"Ikhasi %1$d lika %2$d"</string>
+    <string name="workspace_scroll_format" msgid="7911126267695001437">"Isikhala sokusebenza %1$d se-%2$d"</string>
+    <string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Ukhasi lama-Apps %1$d le-%2$d"</string>
+    <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Ikhasi le-Widgets %1$d le-%2$d"</string>
     <string name="workspace_cling_title" msgid="738396473989890567">"Zizwe usekhaya"</string>
     <string name="workspace_cling_move_item" msgid="791013895761065070">"Ungafaka izinsiza zakho ozithandayo lapha."</string>
     <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Ukubona zonke izinsiza zakho, thinta indingiliza."</string>
     <string name="all_apps_cling_title" msgid="2559734712581447107">"Khetha ezinye izinsiza"</string>
-    <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Ukwengeza insiza eskrinini sakho sasekhaya, thinta &amp;uyibambe."</string>
+    <string name="all_apps_cling_add_item" msgid="5665035103260318891">"Ukwengeza insiza eskrinini sakho sasekhaya, thinta &amp;uyibambe."</string>
     <string name="folder_cling_title" msgid="4308949882377840953">"Hlela izinsiza zakho ngamafolda"</string>
     <string name="folder_cling_move_item" msgid="270598675060435169">"Ukususa insiza, thinta &amp; uyibambe."</string>
-    <string name="folder_cling_create_folder" msgid="289412698047625601">"Ukwenza ifolda entsha eskrinini sakho sasekhaya, beka insiza eyodwa phezulu kwenye."</string>
+    <string name="folder_cling_create_folder" msgid="8352867485656129478">"Ukwenza ifolda entsha eskrinini sakho sasekhaya, beka insiza eyodwa phezulu kwenye."</string>
     <string name="cling_dismiss" msgid="2780907108735868381">"KULUNGILE"</string>
+    <string name="folder_opened" msgid="4129072635480822768">"Ifolda ivulekile, %1$d ngo %2$d"</string>
+    <string name="folder_tap_to_close" msgid="4076794242530255812">"Qhofoza ukuvala ifolda"</string>
+    <string name="folder_tap_to_rename" msgid="2125528923948315223">"Qhofoza ukuqamba kabusha"</string>
+    <string name="folder_closed" msgid="3130534551370511932">"Ifolda ivaliwe"</string>
+    <string name="folder_renamed" msgid="781234745487414781">"Ifolda iqanjwe kabusha ku-%1$s"</string>
+    <string name="folder_name_format" msgid="4513766553514769310">"Ifolda: %1$s"</string>
 </resources>