summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrint E. Kriebel <bekit@cyngn.com>2014-03-28 00:18:22 (GMT)
committerBrint E. Kriebel <bekit@cyngn.com>2014-03-28 00:18:22 (GMT)
commit3d4b9e87fa0747f6fac2cea23a7b947bc6498750 (patch)
tree2f0d536008c3e2d3535fdffeba6c72703991b326
parent3fb51da1465132371670b7870ee75e0f0ceada64 (diff)
parentc5a6dc0f1f7171c7f7732388194afe11a2665d64 (diff)
downloadandroid_packages_apps_Trebuchet-3d4b9e87fa0747f6fac2cea23a7b947bc6498750.zip
android_packages_apps_Trebuchet-3d4b9e87fa0747f6fac2cea23a7b947bc6498750.tar.gz
android_packages_apps_Trebuchet-3d4b9e87fa0747f6fac2cea23a7b947bc6498750.tar.bz2
Merge remote-tracking branch 'github/cm-11.0' into HEAD
-rw-r--r--res/values-es-rXA/cm_arrays.xml39
-rw-r--r--res/values-es-rXA/cm_strings.xml48
-rw-r--r--res/values-es-rXA/strings.xml123
-rw-r--r--res/values-ug-land/strings.xml23
-rw-r--r--res/values-ug/strings.xml122
-rw-r--r--src/com/android/launcher3/LauncherModel.java7
-rw-r--r--src/com/android/launcher3/Workspace.java4
-rw-r--r--src/com/android/launcher3/settings/SettingsActivity.java15
8 files changed, 373 insertions, 8 deletions
diff --git a/res/values-es-rXA/cm_arrays.xml b/res/values-es-rXA/cm_arrays.xml
new file mode 100644
index 0000000..613b386
--- /dev/null
+++ b/res/values-es-rXA/cm_arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <string-array name="preferences_interface_general_icons_text_font_family_entries">
+ <item>Normal</item>
+ <item>Fina</item>
+ <item>Comprimida</item>
+ </string-array>
+ <string-array name="transition_effect_entries">
+ <item>Nengún</item>
+ <item>Zoom entrante</item>
+ <item>Zoom saliente</item>
+ <item>Rotar arriba</item>
+ <item>Rotar abaxo</item>
+ <item>Cúbicu entrante</item>
+ <item>Cúbicu saliente</item>
+ <item>Empilar</item>
+ <item>Acordión</item>
+ <item>Voltiar</item>
+ <item>Cilíndricu entrante</item>
+ <item>Cilíndricu saliente</item>
+ <item>Carrusel</item>
+ <item>Perspeutiva</item>
+ </string-array>
+</resources>
diff --git a/res/values-es-rXA/cm_strings.xml b/res/values-es-rXA/cm_strings.xml
new file mode 100644
index 0000000..08d6909
--- /dev/null
+++ b/res/values-es-rXA/cm_strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <string name="application_copyright">Copyright \u00A9 2014 The CyanogenMod Project</string>
+ <string name="sort_button_text">Ordenar</string>
+ <string name="filter_button_text">Filtriar</string>
+ <string name="default_screen_button_text">Pantalla por defeutu</string>
+ <string name="transition_effect_button_text">Efeutu de desplazamientu</string>
+ <string name="sort_mode_title">Títulu</string>
+ <string name="sort_mode_launch_count">Vegaes executáu</string>
+ <string name="sort_mode_install_time">Data d\'instalación</string>
+ <string name="scrolling_page_outlines">Berbesos de pantalla</string>
+ <string name="scrolling_fade_adjacent">Efeutu de dilíu</string>
+ <string name="wallpaper_scroll">Desplazar fondu</string>
+ <string name="preferences_title">Axustes</string>
+ <string name="preferences_application_title">Aplicación</string>
+ <string name="preferences_interface_homescreen_title">Pantalla d\'aniciu</string>
+ <string name="preferences_interface_homescreen_search_title">Barra de gueta</string>
+ <string name="preferences_interface_homescreen_search_summary">Habilitar permantentemente la barra de gueta</string>
+ <string name="preferences_interface_drawer_title">Aplicaciones</string>
+ <string name="preferences_interface_dock_title">Barra d\'aplicaciones</string>
+ <string name="preferences_interface_general_title">Xeneral</string>
+ <string name="preferences_interface_general_icons_category">Iconos</string>
+ <string name="preferences_interface_general_icons_large_title">Iconos grandes</string>
+ <string name="preferences_interface_general_icons_large_summary">Usar iconos grandes na pantalla d\'aniciu y d\'aplicaciones</string>
+ <string name="preferences_interface_general_icons_text_style_title">Estilu\'l testu</string>
+ <string name="preferences_interface_general_icons_text_style_summary">Camudar l\'estilu\'l testu pa les etiquetes de los iconos</string>
+ <string name="dialog_pick_iconpack_title">Esbillar paquete d\'iconos</string>
+ <string name="default_iconpack_title">Iconos por defeutu</string>
+ <string name="icon_packs_title">Paquetes d\'iconos</string>
+ <string name="no_iconpacks_summary">Nun hai paquetes d\'iconos instalaos</string>
+ <string name="all_apps_cling_cm">Personaliza les tos aplicaciones</string>
+ <string name="all_apps_cling_summary">Primi l\'indicador de páxina p\'amosar axustes adicionales</string>
+</resources>
diff --git a/res/values-es-rXA/strings.xml b/res/values-es-rXA/strings.xml
new file mode 100644
index 0000000..30bca32
--- /dev/null
+++ b/res/values-es-rXA/strings.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+* Copyright (C) 2008 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="application_name" msgid="5181331383435256801">Launcher3</string>
+ <string name="home" msgid="7658288663002113681">Home</string>
+ <string name="uid_name" msgid="7820867637514617527">Aplicaciones básiques d\'Android</string>
+ <string name="folder_name" msgid="7371454440695724752"></string>
+ <string name="wallpaper_instructions" msgid="563973358787555519">Afitar fondu</string>
+ <plurals name="number_of_items_selected">
+ <item quantity="zero" msgid="7464587177007785408">Esbillaos: %1$d</item>
+ <item quantity="one" msgid="142482526010824029">Esbilláu: %1$d</item>
+ <item quantity="other" msgid="1418352074806573570">Esbillaos: %1$d</item>
+ </plurals>
+ <string name="wallpaper_accessibility_name" msgid="1655953108132967972">Fondu pantalla %1$d de %2$d</string>
+ <string name="announce_selection" msgid="8338254712932127413"><xliff:g id="LABEL">%1$s</xliff:g> esbilláu</string>
+ <string name="wallpaper_delete" msgid="8095005658756613921">Desaniciar</string>
+ <string name="pick_image" msgid="1272073934062909527">Esbillar imaxe</string>
+ <string name="pick_wallpaper" msgid="8179698221502010609">Fondos de pantalla</string>
+ <string name="crop_wallpaper" msgid="8334345984491368009">Retayar fondu pantalla</string>
+ <string name="activity_not_found" msgid="8071924732094499514">L\'aplicación nun ta instalada.</string>
+ <string name="widgets_tab_label" msgid="2921133187116603919">Widgets</string>
+ <string name="widget_adder" msgid="3201040140710381657">Widgets</string>
+ <string name="toggle_weight_watcher" msgid="5645299835184636119">Amosar memoria</string>
+ <string name="long_press_widget_to_add" msgid="7699152356777458215">Caltén primíu\'l widget que quieras esbillar.</string>
+ <string name="market" msgid="2619650989819296998">Tienda</string>
+ <string name="widget_dims_format" msgid="2370757736025621599">%1$d × %2$d</string>
+ <string name="external_drop_widget_error" msgid="3165821058322217155">Fallu al arrastrar l\'elementu a la pantalla d\'aniciu.</string>
+ <string name="external_drop_widget_pick_title" msgid="3486317258037690630">Esbilla un widget p\'amestar</string>
+ <string name="rename_folder_label" msgid="3727762225964550653">Nome de carpeta</string>
+ <string name="rename_folder_title" msgid="3771389277707820891">Camudar nome de carpeta</string>
+ <string name="rename_action" msgid="5559600076028658757">Aceutar</string>
+ <string name="cancel_action" msgid="7009134900002915310">Encaboxar</string>
+ <string name="menu_item_add_item" msgid="1264911265836810421">Amestar a la pantalla d\'aniciu</string>
+ <string name="group_applications" msgid="3797214114206693605">Aplicaciones</string>
+ <string name="group_shortcuts" msgid="6012256992764410535">Accesos direutos</string>
+ <string name="group_widgets" msgid="1569030723286851002">Widgets</string>
+ <string name="completely_out_of_space" msgid="6106288382070760318">Nun queda espaciu nes pantalles d\'aniciu.</string>
+ <string name="out_of_space" msgid="4691004494942118364">Nun queda espaciu na pantalla d\'aniciu.</string>
+ <string name="hotseat_out_of_space" msgid="9139760413395605841">Nun queda espaciu na barra d\'accesos direutos.</string>
+ <string name="invalid_hotseat_item" msgid="1211534262129849507">Esti widget ye abondo grande pa la barra d\'accesos direutos.</string>
+ <string name="shortcut_installed" msgid="1701742129426969556">Creóse l\'accesu direutu \"<xliff:g id="NAME">%s</xliff:g>\".</string>
+ <string name="shortcut_uninstalled" msgid="8176767991305701821">Desanicióse l\'accesu direutu \"<xliff:g id="NAME">%s</xliff:g>\".</string>
+ <string name="shortcut_duplicate" msgid="9167217446062498127">L\'accesu direutu \"<xliff:g id="NAME">%s</xliff:g>\" yá esiste.</string>
+ <string name="title_select_shortcut" msgid="6680642571148153868">Esbilla un accesu direutu</string>
+ <string name="title_select_application" msgid="3280812711670683644">Esbilla una aplicación</string>
+ <string name="all_apps_button_label" msgid="9110807029020582876">Aplicaciones</string>
+ <string name="all_apps_home_button_label" msgid="252062713717058851">Aniciu</string>
+ <string name="delete_zone_label_workspace" msgid="4009607676751398685">Desaniciar</string>
+ <string name="delete_zone_label_all_apps" msgid="8083826390278958980">Desinstalar</string>
+ <string name="delete_target_label" msgid="1822697352535677073">Desaniciar</string>
+ <string name="delete_target_uninstall_label" msgid="5100785476250872595">Desinstalar</string>
+ <string name="info_target_label" msgid="8053346143994679532">Información de l\'aplicación</string>
+ <string name="accessibility_search_button" msgid="1628520399424565142">Guetar</string>
+ <string name="accessibility_voice_search_button" msgid="4637324840434406584">Gueta por voz</string>
+ <string name="accessibility_all_apps_button" msgid="2603132375383800483">Aplicaciones</string>
+ <string name="accessibility_delete_button" msgid="6466114477993744621">Desaniciar</string>
+ <string name="delete_zone_label_all_apps_system_app" msgid="449755632749610895">Desinstalar anovamientu</string>
+ <string name="cab_menu_delete_app" msgid="7435191475867183689">Desinstalar aplicación</string>
+ <string name="cab_menu_app_info" msgid="8593722221450362342">Información de l\'aplicación</string>
+ <string name="cab_app_selection_text" msgid="374688303047985416">1 aplicación esbillada</string>
+ <string name="cab_widget_selection_text" msgid="1833458597831541241">1 widget esbilláu</string>
+ <string name="cab_folder_selection_text" msgid="7999992513806132118">1 carpeta esbillada</string>
+ <string name="cab_shortcut_selection_text" msgid="2103811025667946450">1 accesu direutu esbilláu</string>
+ <string name="permlab_install_shortcut" msgid="5632423390354674437">instalar accesos direutos</string>
+ <string name="permdesc_install_shortcut" msgid="923466509822011139">Permite qu\'una aplicación amieste accesos direutos ensin intervención del usuariu.</string>
+ <string name="permlab_uninstall_shortcut" msgid="864595034498083837">desinstalar accesos direutos</string>
+ <string name="permdesc_uninstall_shortcut" msgid="5134129545001836849">Permite que l\'aplicación desanicie accesos direutos ensin intervención del usuariu.</string>
+ <string name="permlab_read_settings" msgid="1941457408239617576">lleer información d\'accesos direutos y d\'axustes de la pantalla d\'aniciu</string>
+ <string name="permdesc_read_settings" msgid="5833423719057558387">Permite que l\'aplicación consulte los axustes y los accesos direutos de la pantalla d\'aniciu.</string>
+ <string name="permlab_write_settings" msgid="3574213698004620587">escribir información d\'atayos y d\'axustes de la pantalla d\'aniciu</string>
+ <string name="permdesc_write_settings" msgid="5440712911516509985">Permite que les aplicaciones camuden los axustes y los accesos direutos de la pantalla d\'aniciu.</string>
+ <string name="gadget_error_text" msgid="6081085226050792095">Fallu al cargar el widget</string>
+ <string name="uninstall_system_app_text" msgid="4172046090762920660">Esta aplicación ye del sistema y nun pue desinstalase.</string>
+ <string name="dream_name" msgid="1530253749244328964">Rocket Launcher</string>
+ <string name="folder_hint_text" msgid="6617836969016293992">Carpeta ensin nome</string>
+ <string name="workspace_description_format" msgid="2950174241104043327">Pantalla d\'aniciu %1$d</string>
+ <string name="default_scroll_format" msgid="7475544710230993317">Páxina %1$d de %2$d</string>
+ <string name="workspace_scroll_format" msgid="8458889198184077399">Pantalla d\'aniciu %1$d de %2$d</string>
+ <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">Páxina d\'aplicaciones %1$d de %2$d</string>
+ <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">Páxina de widgets %1$d de %2$d</string>
+ <string name="first_run_cling_title" msgid="7257389003637362144">Dámoste l\'acoyida</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">Personaliza la to pantalla d\'aniciu.</string>
+ <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
+ <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
+ <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">Crea más pantalles p\'aplicaciones y carpetes</string>
+ <string name="workspace_cling_title" msgid="5626202359865825661">Organiza\'l to espaciu</string>
+ <string name="workspace_cling_move_item" msgid="528201129978005352">Caltén primíu\'l fondu p\'alministrar el fondu pantalla, los widgets y los axustes.</string>
+ <string name="all_apps_cling_title" msgid="34929250753095858">Esbilla dalgunes aplicaciones</string>
+ <string name="all_apps_cling_add_item" msgid="400866858451850784">P\'amestar una aplicación a la to pantalla d\'aniciu, namái tienes que caltenela primida.</string>
+ <string name="folder_cling_title" msgid="3894908818693254164">Esto ye una carpeta</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">Pa crear una carpeta como esta, caltén primida una aplicación y muévila sobre otra.</string>
+ <string name="cling_dismiss" msgid="8962359497601507581">Aceutar</string>
+ <string name="folder_opened" msgid="94695026776264709">Carpeta abierta, <xliff:g id="WIDTH">%1$d</xliff:g> por <xliff:g id="HEIGHT">%2$d</xliff:g></string>
+ <string name="folder_tap_to_close" msgid="1884479294466410023">Primi pa zarrar la carpeta</string>
+ <string name="folder_tap_to_rename" msgid="9191075570492871147">Primi pa camudar el nome nuevu</string>
+ <string name="folder_closed" msgid="4100806530910930934">Carpeta zarrada</string>
+ <string name="folder_renamed" msgid="1794088362165669656">Camudóse\'l nome la carpeta a <xliff:g id="NAME">%1$s</xliff:g></string>
+ <string name="folder_name_format" msgid="6629239338071103179">Carpeta: <xliff:g id="NAME">%1$s</xliff:g></string>
+ <string name="custom_workspace_cling_title_1" msgid="3750880082935033085"></string>
+ <string name="custom_workspace_cling_description_1" msgid="939966842147696724"></string>
+ <string name="custom_workspace_cling_title_2" msgid="662588444436552198"></string>
+ <string name="custom_workspace_cling_description_2" msgid="8097921091798539310"></string>
+ <string name="widget_button_text" msgid="2880537293434387943">Widgets</string>
+ <string name="wallpaper_button_text" msgid="8404103075899945851">Fondos de pantalla</string>
+ <string name="settings_button_text" msgid="8119458837558863227">Axustes</string>
+</resources>
diff --git a/res/values-ug-land/strings.xml b/res/values-ug-land/strings.xml
new file mode 100644
index 0000000..7a6ba11
--- /dev/null
+++ b/res/values-ug-land/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+* Copyright (C) 2011 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+ -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="delete_target_label" msgid="4155210680095864979"/>
+ <string name="delete_target_uninstall_label" msgid="1839407506844917298"/>
+ <string name="info_target_label" msgid="1424400595004570393"/>
+</resources> \ No newline at end of file
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
new file mode 100644
index 0000000..469746a
--- /dev/null
+++ b/res/values-ug/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+* Copyright (C) 2008 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+ -->
+<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="5181331383435256801">"Launcher3"</string>
+ <string name="home" msgid="7658288663002113681">"باش بەت"</string>
+ <string name="uid_name" msgid="7820867637514617527">"ئاندىرويىد يادرولۇق ئەپلەر"</string>
+ <string name="folder_name" msgid="7371454440695724752"/>
+ <string name="wallpaper_instructions" msgid="563973358787555519">"تام قەغەز تەڭشىكى"</string>
+ <plurals name="number_of_items_selected">
+ <item quantity="zero" msgid="7464587177007785408">"%1$d تاللاندى"</item>
+ <item quantity="one" msgid="142482526010824029">"%1$d تاللاندى"</item>
+ <item quantity="other" msgid="1418352074806573570">"%1$d تاللاندى"</item>
+ </plurals>
+ <string name="wallpaper_accessibility_name" msgid="1655953108132967972">"%2$d دىن %1$d تام قەغەز" </string>
+ <string name="announce_selection" msgid="8338254712932127413">"<xliff:g id="LABEL">%1$s</xliff:g> تاللاندى"</string>
+ <string name="wallpaper_delete" msgid="8095005658756613921">"ئۆچۈر"</string>
+ <string name="pick_image" msgid="1272073934062909527">"سۈرەت تاللاڭ"</string>
+ <string name="pick_wallpaper" msgid="8179698221502010609">"تام قەغەزلەر"</string>
+ <string name="crop_wallpaper" msgid="8334345984491368009">"تام قەغەز كەس"</string>
+ <string name="activity_not_found" msgid="8071924732094499514">"ئەپ ئورنىتىلمىغان."</string>
+ <string name="widgets_tab_label" msgid="2921133187116603919">"ئەپچەلەر"</string>
+ <string name="widget_adder" msgid="3201040140710381657">"ئەپچەلەر"</string>
+ <string name="toggle_weight_watcher" msgid="5645299835184636119">"ئەسلەكنى كۆرسەت"</string>
+ <string name="long_press_widget_to_add" msgid="7699152356777458215">"چېكىپ بېسىلسا ئەپچە تاللىغىلى بولىدۇ."</string>
+ <string name="market" msgid="2619650989819296998">"دۇكان"</string>
+ <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
+ <string name="external_drop_widget_error" msgid="3165821058322217155">"بۇ باش ئېكرانغا تۈر تاشلىغىلى بولمايدۇ."</string>
+ <string name="external_drop_widget_pick_title" msgid="3486317258037690630">"قۇرىدىغان ئەپچەنى تاللاڭ"</string>
+ <string name="rename_folder_label" msgid="3727762225964550653">"قىسقۇچ ئاتى"</string>
+ <string name="rename_folder_title" msgid="3771389277707820891">"قىسقۇچ ئاتىنى ئۆزگەرت"</string>
+ <string name="rename_action" msgid="5559600076028658757">"جەزملە"</string>
+ <string name="cancel_action" msgid="7009134900002915310">"ۋاز كەچ"</string>
+ <string name="menu_item_add_item" msgid="1264911265836810421">"باش ئېكرانغا قوش"</string>
+ <string name="group_applications" msgid="3797214114206693605">"ئەپلەر"</string>
+ <string name="group_shortcuts" msgid="6012256992764410535">"قىسقا يول"</string>
+ <string name="group_widgets" msgid="1569030723286851002">"ئەپچەلەر"</string>
+ <string name="completely_out_of_space" msgid="6106288382070760318">"باش ئېكرانىڭىزدا ئورۇن يوق."</string>
+ <string name="out_of_space" msgid="4691004494942118364">"باش ئېكراندا ئورۇن يوق."</string>
+ <string name="hotseat_out_of_space" msgid="9139760413395605841">"ئاساسىي تەگلىكتە ئورۇن يوق."</string>
+ <string name="invalid_hotseat_item" msgid="1211534262129849507">"ئاساسىي تەگلىك ئۈچۈن بۇ ئەپچە بەك چوڭ."</string>
+ <string name="shortcut_installed" msgid="1701742129426969556">""<xliff:g id="NAME">%s</xliff:g>" قىسقا يول قۇرۇلدى."</string>
+ <string name="shortcut_uninstalled" msgid="8176767991305701821">""<xliff:g id="NAME">%s</xliff:g>" قىسقا يول چىقىرىۋېتىلدى."</string>
+ <string name="shortcut_duplicate" msgid="9167217446062498127">""<xliff:g id="NAME">%s</xliff:g>" قىسقا يول مەۋجۇد."</string>
+ <string name="title_select_shortcut" msgid="6680642571148153868">"قىسقا يول تاللاڭ"</string>
+ <string name="title_select_application" msgid="3280812711670683644">"ئەپ تاللاڭ"</string>
+ <string name="all_apps_button_label" msgid="9110807029020582876">"ئەپلەر"</string>
+ <string name="all_apps_home_button_label" msgid="252062713717058851">"باش بەت"</string>
+ <string name="delete_zone_label_workspace" msgid="4009607676751398685">"چىقىرىۋەت"</string>
+ <string name="delete_zone_label_all_apps" msgid="8083826390278958980">"ئۆچۈر"</string>
+ <string name="delete_target_label" msgid="1822697352535677073">"چىقىرىۋەت"</string>
+ <string name="delete_target_uninstall_label" msgid="5100785476250872595">"ئۆچۈر"</string>
+ <string name="info_target_label" msgid="8053346143994679532">"ئەپ ئۇچۇرى"</string>
+ <string name="accessibility_search_button" msgid="1628520399424565142">"ئىزدە"</string>
+ <string name="accessibility_voice_search_button" msgid="4637324840434406584">"تاۋۇش ئىزدەش"</string>
+ <string name="accessibility_all_apps_button" msgid="2603132375383800483">"ئەپلەر"</string>
+ <string name="accessibility_delete_button" msgid="6466114477993744621">"چىقىرىۋەت"</string>
+ <string name="delete_zone_label_all_apps_system_app" msgid="449755632749610895">"يېڭىلاش ئۆچۈرەمدۇ"</string>
+ <string name="cab_menu_delete_app" msgid="7435191475867183689">"ئەپنى ئۆچۈر"</string>
+ <string name="cab_menu_app_info" msgid="8593722221450362342">"ئەپ تەپسىلاتى"</string>
+ <string name="cab_app_selection_text" msgid="374688303047985416">"1 ئەپ تاللاندى"</string>
+ <string name="cab_widget_selection_text" msgid="1833458597831541241">"1 ئەپچە تاللاندى"</string>
+ <string name="cab_folder_selection_text" msgid="7999992513806132118">"1 قىسقۇچ تاللاندى"</string>
+ <string name="cab_shortcut_selection_text" msgid="2103811025667946450">"1 قىسقا يول تاللاندى"</string>
+ <string name="permlab_install_shortcut" msgid="5632423390354674437">"قىسقا يول ئورنىتىش"</string>
+ <string name="permdesc_install_shortcut" msgid="923466509822011139">"ئەپنىڭ ئىشلەتكۈچى ئارىلاشمىغان ئەھۋالدا قىسقا يول قۇرۇشقا يول قويىدۇ."</string>
+ <string name="permlab_uninstall_shortcut" msgid="864595034498083837">"قىسقا يول ئۆچۈر"</string>
+ <string name="permdesc_uninstall_shortcut" msgid="5134129545001836849">"ئەپنىڭ ئىشلەتكۈچى ئارىلاشمىغان ئەھۋالدا قىسقا يولنى چىقىرىۋېتىشكە يول قويىدۇ."</string>
+ <string name="permlab_read_settings" msgid="1941457408239617576">"باش بەتتىكى تەڭشەك ۋە قىسقا يولنى ئوقۇيدۇ"</string>
+ <string name="permdesc_read_settings" msgid="5833423719057558387">"ئەپنىڭ باش بەتتىكى تەڭشەك ۋە قىسقا يولنى ئوقۇشىغا يول قويىدۇ."</string>
+ <string name="permlab_write_settings" msgid="3574213698004620587">"باش بەتتىكى تەڭشەك ۋە قىسقا يولنى ياز"</string>
+ <string name="permdesc_write_settings" msgid="5440712911516509985">"ئەپنىڭ باش بەتتىكى تەڭشەك ۋە قىسقا يولنى ئۆزگەرتىشىگە يول قويىدۇ."</string>
+ <string name="gadget_error_text" msgid="6081085226050792095">"ئەپچە يۈكلەشتە خاتالىق كۆرۈلدى."</string>
+ <string name="uninstall_system_app_text" msgid="4172046090762920660">"بۇ سىستېما ئەپ، ئۆچۈرگىلى بولمايدۇ."</string>
+ <string name="dream_name" msgid="1530253749244328964">"Rocket قوزغاتقۇچ"</string>
+ <string name="folder_hint_text" msgid="6617836969016293992">"ئاتسىز قىسقۇچ"</string>
+ <string name="workspace_description_format" msgid="2950174241104043327">"باش ئېكران %1$d"</string>
+ <string name="default_scroll_format" msgid="7475544710230993317">"%1$d-بەت، جەمئىي %2$d بەت"</string>
+ <string name="workspace_scroll_format" msgid="8458889198184077399">"باش ئېكران %1$d/%2$d"</string>
+ <string name="apps_customize_apps_scroll_format" msgid="370005296147130238">"%1$d-ئەپ بەت، جەمئىي %2$d بەت"</string>
+ <string name="apps_customize_widgets_scroll_format" msgid="3106209519974971521">"%1$d-ئەپچە بەت، جەمئىي %2$d بەت"</string>
+ <string name="first_run_cling_title" msgid="7257389003637362144">"مەرھابا!"</string>
+ <string name="first_run_cling_description" msgid="6447072552696253358">"ئۆزىڭىزنىڭ باش ئېكرانىنى ھاسىل قىلىڭ."</string>
+ <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"/>
+ <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"/>
+ <string name="first_run_cling_create_screens_hint" msgid="6950729526680114157">"ئەپ ۋە قىسقۇچلار ئۈچۈن تېخىمۇ كۆپ ئېكران قۇرىدۇ"</string>
+ <string name="workspace_cling_title" msgid="5626202359865825661">"بوشلۇقىڭىزنى تەشكىللەڭ"</string>
+ <string name="workspace_cling_move_item" msgid="528201129978005352">"تەگلىك چېكىلىپ بېسىپ تۇرۇلسا، تام قەغەز، ئەپچە ۋە تەڭشەكلەرنى باشقۇرىدۇ."</string>
+ <string name="all_apps_cling_title" msgid="34929250753095858">"ئەپلەرنى تاللاڭ"</string>
+ <string name="all_apps_cling_add_item" msgid="400866858451850784">"باش ئېكرانغا ئەپ قوشۇشتا، ئەپنى تۇتۇپ، ئۇنى بېسىپ تۇرۇڭ."</string>
+ <string name="folder_cling_title" msgid="3894908818693254164">"بۇ بىر قىسقۇچ"</string>
+ <string name="folder_cling_create_folder" msgid="6158215559475836131">"ئوخشاش بىر قىسقۇچ قۇرۇشتا، مەلۇم بىر ئەپنى چېكىپ بېسىپ تۇرۇپ ئاندىن ئۇنى باشقا بىر ئەپ ئۈستىگە يۆتكەڭ."</string>
+ <string name="cling_dismiss" msgid="8962359497601507581">"جەزملە"</string>
+ <string name="folder_opened" msgid="94695026776264709">"قىسقۇچ ئېچىلدى، سىغىمى <xliff:g id="WIDTH">%1$d</xliff:g>×<xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
+ <string name="folder_tap_to_close" msgid="1884479294466410023">"چېكىلسە قىسقۇچ ياپىدۇ"</string>
+ <string name="folder_tap_to_rename" msgid="9191075570492871147">"چېكىلسە ئات ئۆزگەرتىشنى ساقلايدۇ"</string>
+ <string name="folder_closed" msgid="4100806530910930934">"قىسقۇچ تاقالدى"</string>
+ <string name="folder_renamed" msgid="1794088362165669656">"قىسقۇچ ئاتى <xliff:g id="NAME">%1$s</xliff:g> غا ئۆزگەردى"</string>
+ <string name="folder_name_format" msgid="6629239338071103179">"قىسقۇچ: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+ <string name="custom_workspace_cling_title_1" msgid="3750880082935033085"/>
+ <string name="custom_workspace_cling_description_1" msgid="939966842147696724"/>
+ <string name="custom_workspace_cling_title_2" msgid="662588444436552198"/>
+ <string name="custom_workspace_cling_description_2" msgid="8097921091798539310"/>
+ <string name="widget_button_text" msgid="2880537293434387943">"ئەپچەلەر"</string>
+ <string name="wallpaper_button_text" msgid="8404103075899945851">"تام قەغەزلەر"</string>
+ <string name="settings_button_text" msgid="8119458837558863227">"تەڭشەكلەر"</string>
+</resources> \ No newline at end of file
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index d79e627..bc97e0a 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1308,8 +1308,6 @@ public class LauncherModel extends BroadcastReceiver {
AtomicBoolean deleteOnItemOverlap) {
LauncherAppState app = LauncherAppState.getInstance();
DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
- int countX = (int) grid.numColumns;
- int countY = (int) grid.numRows;
long containerIndex = item.screenId;
if (item.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
@@ -1333,7 +1331,7 @@ public class LauncherModel extends BroadcastReceiver {
return true;
}
} else {
- ItemInfo[][] items = new ItemInfo[countX + 1][countY + 1];
+ ItemInfo[][] items = new ItemInfo[(int) grid.numHotseatIcons][1];
items[(int) item.screenId][0] = item;
occupied.put((long) LauncherSettings.Favorites.CONTAINER_HOTSEAT, items);
return true;
@@ -1343,6 +1341,9 @@ public class LauncherModel extends BroadcastReceiver {
return true;
}
+ int countX = (int) grid.numColumns;
+ int countY = (int) grid.numRows;
+
if (!occupied.containsKey(item.screenId)) {
ItemInfo[][] items = new ItemInfo[countX + 1][countY + 1];
occupied.put(item.screenId, items);
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 99c8ec0..c99a0a5 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1539,8 +1539,8 @@ public class Workspace extends SmoothPagedView
boolean isOnLastPageBeforeCustomContent = false;
if (hasCustomContent()) {
int customContentWidth = mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).getMeasuredWidth();
- isOnLastPageBeforeCustomContent = (mOverScrollX < customContentWidth && (!hasCustomContent() || isLayoutRtl())) ||
- (mOverScrollX > mMaxScrollX - customContentWidth && (!hasCustomContent() || !isLayoutRtl()));
+ isOnLastPageBeforeCustomContent = (mOverScrollX < customContentWidth && !isLayoutRtl()) ||
+ ((mOverScrollX > mMaxScrollX - customContentWidth) && isLayoutRtl());
}
mUseTransitionEffect = !isOnLastPageBeforeCustomContent && mState == State.NORMAL && !mIsSwitchingState;
diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index 466a01f..182a6bf 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -31,6 +31,7 @@ import android.widget.ListAdapter;
import android.widget.TextView;
import com.android.launcher3.R;
+import java.util.ArrayList;
import java.util.List;
public class SettingsActivity extends PreferenceActivity
@@ -38,7 +39,6 @@ public class SettingsActivity extends PreferenceActivity
private static final String TAG = "Launcher3.SettingsActivity";
private SharedPreferences mSettings;
- private List<Header> mHeaders;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -90,7 +90,6 @@ public class SettingsActivity extends PreferenceActivity
public void onBuildHeaders(List<Header> target) {
loadHeadersFromResource(R.xml.preferences_headers, target);
updateHeaders(target);
- mHeaders = target;
}
private void updateHeaders(List<Header> headers) {
@@ -115,7 +114,8 @@ public class SettingsActivity extends PreferenceActivity
if (adapter == null) {
super.setListAdapter(null);
} else {
- super.setListAdapter(new HeaderAdapter(this, mHeaders));
+ List<Header> headers = getHeadersFromAdapter(adapter);
+ super.setListAdapter(new HeaderAdapter(this, headers));
}
}
@@ -126,6 +126,15 @@ public class SettingsActivity extends PreferenceActivity
editor.commit();
}
+ private List<Header> getHeadersFromAdapter(ListAdapter adapter) {
+ List<Header> headers = new ArrayList<Header>();
+ int count = adapter.getCount();
+ for (int i = 0; i < count; i++) {
+ headers.add((Header)adapter.getItem(i));
+ }
+ return headers;
+ }
+
public static class HomescreenFragment extends PreferenceFragment {
@Override
public void onCreate(Bundle savedInstanceState) {