Merge commit '8fa85d20' into klp-dev-plus-aosp

Conflicts:
	res/values-lo-rLA/strings.xml

diff --cc res/values-af/strings.xml
Simple merge

diff --cc res/values-am/strings.xml
Simple merge

diff --cc res/values-ar/strings.xml
Simple merge

diff --cc res/values-bg/strings.xml
index 626345a,9082929..02b1abf
--- 1/res/values-bg/strings.xml
--- 2/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@@ -102,18 -89,12 +101,14 @@@
      <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">"Създаване на още екрани за приложения и папки"</string>
-     <!-- no translation found for migration_cling_title (9181776667882933767) -->
-     <skip />
-     <!-- no translation found for migration_cling_description (2752413805582227644) -->
-     <skip />
-     <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-     <skip />
-     <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-     <skip />
+     <string name="migration_cling_title" msgid="9181776667882933767">"Икони на прилож. ви: Копиране"</string>
+     <string name="migration_cling_description" msgid="2752413805582227644">"Да се импортират ли иконите и папките от старите ви начални екрани?"</string>
+     <string name="migration_cling_copy_apps" msgid="946331230090919440">"КОПИРАНЕ НА ИКОНИТЕ"</string>
+     <string name="migration_cling_use_default" msgid="2626475813981258626">"СТАРТИРАНЕ ОТНАЧАЛО"</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">"ОK"</string>

diff --cc res/values-ca/strings.xml
Simple merge

diff --cc res/values-cs/strings.xml
Simple merge

diff --cc res/values-da/strings.xml
Simple merge

diff --cc res/values-de/strings.xml
Simple merge

diff --cc res/values-el/strings.xml
Simple merge

diff --cc res/values-en-rGB/strings.xml
Simple merge

diff --cc res/values-en-rIN/strings.xml
Simple merge

diff --cc res/values-es-rUS/strings.xml
Simple merge

diff --cc res/values-es/strings.xml
index 6fc4a42,e5beb90..a05ae69
--- 1/res/values-es/strings.xml
--- 2/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@@ -104,11 -92,9 +104,11 @@@
      <string name="migration_cling_title" msgid="9181776667882933767">"Copiar iconos de aplicaciones"</string>
      <string name="migration_cling_description" msgid="2752413805582227644">"¿Importar iconos y carpetas de pantallas de inicio antiguas?"</string>
      <string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ICONOS"</string>
-     <string name="migration_cling_use_default" msgid="2626475813981258626">"INICIAR ACTUALIZACIÓN"</string>
+     <string name="migration_cling_use_default" msgid="2626475813981258626">"AJUSTES PREDETERMINADOS"</string>
      <string name="workspace_cling_title" msgid="5626202359865825661">"Organiza tu espacio"</string>
      <string name="workspace_cling_move_item" msgid="528201129978005352">"Mantén pulsado el fondo para gestionar el fondo de pantalla, los widgets y los ajustes."</string>
 +    <string name="all_apps_cling_title" msgid="34929250753095858">"Selecciona algunas aplicaciones"</string>
 +    <string name="all_apps_cling_add_item" msgid="400866858451850784">"Para añadir una aplicación a tu pantalla de inicio, solo tienes que mantenerla pulsada."</string>
      <string name="folder_cling_title" msgid="3894908818693254164">"Esto es una carpeta"</string>
      <string name="folder_cling_create_folder" msgid="6158215559475836131">"Para crear una carpeta como esta, mantén pulsada una aplicación y muévela sobre otra."</string>
      <string name="cling_dismiss" msgid="8962359497601507581">"Aceptar"</string>

diff --cc res/values-et-rEE/strings.xml
Simple merge

diff --cc res/values-fa/strings.xml
Simple merge

diff --cc res/values-fi/strings.xml
Simple merge

diff --cc res/values-fr-rCA/strings.xml
Simple merge

diff --cc res/values-fr/strings.xml
Simple merge

diff --cc res/values-hi/strings.xml
Simple merge

diff --cc res/values-hr/strings.xml
Simple merge

diff --cc res/values-hu/strings.xml
Simple merge

diff --cc res/values-hy-rAM/strings.xml
Simple merge

diff --cc res/values-in/strings.xml
Simple merge

diff --cc res/values-it/strings.xml
Simple merge

diff --cc res/values-iw/strings.xml
Simple merge

diff --cc res/values-ja/strings.xml
index bac3494,b396893..bbb49b2
--- 1/res/values-ja/strings.xml
--- 2/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@@ -102,18 -89,12 +101,14 @@@
      <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">"アプリとフォルダの画面をもっと作成します"</string>
-     <!-- no translation found for migration_cling_title (9181776667882933767) -->
-     <skip />
-     <!-- no translation found for migration_cling_description (2752413805582227644) -->
-     <skip />
-     <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-     <skip />
-     <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-     <skip />
+     <string name="migration_cling_title" msgid="9181776667882933767">"アプリのアイコンをコピー"</string>
+     <string name="migration_cling_description" msgid="2752413805582227644">"古いホーム画面からアイコンとフォルダをインポートしますか？"</string>
+     <string name="migration_cling_copy_apps" msgid="946331230090919440">"アイコンをコピー"</string>
+     <string name="migration_cling_use_default" msgid="2626475813981258626">"初期状態にリセットする"</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">"OK"</string>

diff --cc res/values-ka-rGE/strings.xml
Simple merge

diff --cc res/values-km-rKH/strings.xml
Simple merge

diff --cc res/values-ko/strings.xml
Simple merge

diff --cc res/values-lo-rLA/strings.xml
index 2fb2df0,79a0a4a..ed4e17c
--- 1/res/values-lo-rLA/strings.xml
--- 2/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@@ -107,10 -95,8 +107,10 @@@
      <string name="migration_cling_use_default" msgid="2626475813981258626">"ເລີ່ມຕົ້ນໃໝ່"</string>
      <string name="workspace_cling_title" msgid="5626202359865825661">"ຈັດການພື້ນທີ່ຂອງທ່ານ"</string>
      <string name="workspace_cling_move_item" msgid="528201129978005352">"ແຕະຄ້າງໄວ້ທີ່ພາບພື້ນຫຼັງເພື່ອຈັດການພາບພື້ນຫຼັງ, ວິດເຈັດແລະການຕັ້ງຄ່າ."</string>
-     <string name="folder_cling_title" msgid="3894908818693254164">"ນີ້ແມ່ນໂຟນເດີ່"</string>
-     <string name="folder_cling_create_folder" msgid="6158215559475836131">"ເພື່ອສ້າງອັນໃໝ່ແບບນີ້, ແຕະຄ້າງໄວ້ທີ່ແອັບຯ ແລ້ວຍ້າຍມັນໄປຫາໂຕອື່ນ."</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>

diff --cc res/values-lt/strings.xml
Simple merge

diff --cc res/values-lv/strings.xml
Simple merge

diff --cc res/values-mn-rMN/strings.xml
Simple merge

diff --cc res/values-ms-rMY/strings.xml
Simple merge

diff --cc res/values-nb/strings.xml
Simple merge

diff --cc res/values-nl/strings.xml
Simple merge

diff --cc res/values-pl/strings.xml
Simple merge

diff --cc res/values-pt-rPT/strings.xml
Simple merge

diff --cc res/values-pt/strings.xml
Simple merge

diff --cc res/values-rm/strings.xml
Simple merge

diff --cc res/values-ro/strings.xml
Simple merge

diff --cc res/values-ru/strings.xml
index f8343cc,a93583d..16e7f37
--- 1/res/values-ru/strings.xml
--- 2/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@@ -102,18 -89,12 +101,14 @@@
      <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">"Создание дополнительных экранов для приложений и папок"</string>
-     <!-- no translation found for migration_cling_title (9181776667882933767) -->
-     <skip />
-     <!-- no translation found for migration_cling_description (2752413805582227644) -->
-     <skip />
-     <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-     <skip />
-     <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-     <skip />
+     <string name="migration_cling_title" msgid="9181776667882933767">"Копировать значки приложений"</string>
+     <string name="migration_cling_description" msgid="2752413805582227644">"Импортировать значки и папки со старого главного экрана?"</string>
+     <string name="migration_cling_copy_apps" msgid="946331230090919440">"КОПИРОВАТЬ ЗНАЧКИ"</string>
+     <string name="migration_cling_use_default" msgid="2626475813981258626">"ИСПОЛЬЗОВАТЬ СТАНДАРТНЫЙ МАКЕТ"</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>

diff --cc res/values-sk/strings.xml
index 8ca6d90,485a2ec..c2a9507
--- 1/res/values-sk/strings.xml
--- 2/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@@ -102,18 -89,12 +101,14 @@@
      <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">"Vytvorte viac obrazoviek pre aplikácie a priečinky"</string>
-     <!-- no translation found for migration_cling_title (9181776667882933767) -->
-     <skip />
-     <!-- no translation found for migration_cling_description (2752413805582227644) -->
-     <skip />
-     <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-     <skip />
-     <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-     <skip />
+     <string name="migration_cling_title" msgid="9181776667882933767">"Kopírovanie ikon aplikácií"</string>
+     <string name="migration_cling_description" msgid="2752413805582227644">"Chcete importovať ikony a priečinky zo starých plôch?"</string>
+     <string name="migration_cling_copy_apps" msgid="946331230090919440">"SKOPÍROVAŤ IKONY"</string>
+     <string name="migration_cling_use_default" msgid="2626475813981258626">"ZAČAŤ S PREDVOLENÝM ROZLOŽENÍM"</string>
      <string name="workspace_cling_title" msgid="5626202359865825661">"Usporiadajte svoj priestor"</string>
      <string name="workspace_cling_move_item" msgid="528201129978005352">"Ak chcete spravovať tapetu, miniaplikácie a nastavenia, dotknite sa pozadia a podržte."</string>
 +    <string name="all_apps_cling_title" msgid="34929250753095858">"Vyberte niektoré aplikácie"</string>
 +    <string name="all_apps_cling_add_item" msgid="400866858451850784">"Ak chcete pridať aplikáciu na plochu, dotknite sa jej a podržte."</string>
      <string name="folder_cling_title" msgid="3894908818693254164">"Tu je priečinok"</string>
      <string name="folder_cling_create_folder" msgid="6158215559475836131">"Ak chcete vytvoriť takýto priečinok, dotknite sa príslušnej aplikácie a podržte ju. Potom ju presuňte na druhú aplikáciu."</string>
      <string name="cling_dismiss" msgid="8962359497601507581">"OK"</string>

diff --cc res/values-sl/strings.xml
Simple merge

diff --cc res/values-sr/strings.xml
Simple merge

diff --cc res/values-sv/strings.xml
Simple merge

diff --cc res/values-sw/strings.xml
Simple merge

diff --cc res/values-th/strings.xml
Simple merge

diff --cc res/values-tl/strings.xml
Simple merge

diff --cc res/values-tr/strings.xml
index 4a4ee03,42fa172..1ca3883
--- 1/res/values-tr/strings.xml
--- 2/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@@ -102,18 -89,12 +101,14 @@@
      <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">"Uygulamalar ve klasörler için daha fazla ekran oluşturun"</string>
-     <!-- no translation found for migration_cling_title (9181776667882933767) -->
-     <skip />
-     <!-- no translation found for migration_cling_description (2752413805582227644) -->
-     <skip />
-     <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-     <skip />
-     <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-     <skip />
+     <string name="migration_cling_title" msgid="9181776667882933767">"Uygulama simgelerini kopyala"</string>
+     <string name="migration_cling_description" msgid="2752413805582227644">"Eski Ana ekranlarınızdaki simgeler ve klasörler içe aktarılsın mı?"</string>
+     <string name="migration_cling_copy_apps" msgid="946331230090919440">"SİMGELERİ KOPYALA"</string>
+     <string name="migration_cling_use_default" msgid="2626475813981258626">"VARSAYILANI KULLAN"</string>
      <string name="workspace_cling_title" msgid="5626202359865825661">"Alanınızı düzenleyin"</string>
      <string name="workspace_cling_move_item" msgid="528201129978005352">"Duvar kağıdını, widget\'ları ve ayarları yönetmek için arka plana uzun basın."</string>
 +    <string name="all_apps_cling_title" msgid="34929250753095858">"İstediğiniz uygulamaları seçin"</string>
 +    <string name="all_apps_cling_add_item" msgid="400866858451850784">"Bir uygulamayı Ana ekranınıza eklemek için, ilgili uygulamayı basılı tutun."</string>
      <string name="folder_cling_title" msgid="3894908818693254164">"İşte bir klasör"</string>
      <string name="folder_cling_create_folder" msgid="6158215559475836131">"Buna benzer bir klasör oluşturmak için uygulamaya uzun basın ve sonra uygulamayı başka bir uygulamanın üzerine taşıyın."</string>
      <string name="cling_dismiss" msgid="8962359497601507581">"Tamam"</string>

diff --cc res/values-uk/strings.xml
Simple merge

diff --cc res/values-vi/strings.xml
Simple merge

diff --cc res/values-zh-rCN/strings.xml
index f38a6f4,540291e..1222f1c
--- 1/res/values-zh-rCN/strings.xml
--- 2/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@@ -102,18 -89,12 +101,14 @@@
      <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">"添加更多屏幕来容纳应用和文件夹"</string>
-     <!-- no translation found for migration_cling_title (9181776667882933767) -->
-     <skip />
-     <!-- no translation found for migration_cling_description (2752413805582227644) -->
-     <skip />
-     <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->
-     <skip />
-     <!-- no translation found for migration_cling_use_default (2626475813981258626) -->
-     <skip />
+     <string name="migration_cling_title" msgid="9181776667882933767">"复制应用图标"</string>
+     <string name="migration_cling_description" msgid="2752413805582227644">"要导入旧的主屏幕中的图标和文件夹吗？"</string>
+     <string name="migration_cling_copy_apps" msgid="946331230090919440">"复制图标"</string>
+     <string name="migration_cling_use_default" msgid="2626475813981258626">"使用全新配置"</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>

diff --cc res/values-zh-rHK/strings.xml
Simple merge

diff --cc res/values-zh-rTW/strings.xml
Simple merge

diff --cc res/values-zu/strings.xml
Simple merge

diff --cc src/com/android/launcher3/LauncherBackupHelper.java
Simple merge