Merge remote-tracking branch 'origin/upstream' into trunk

# Conflicts:
#	lawnchair/src/app/lawnchair/LawnchairLauncher.kt

lawnchair/res/values-es-rES/strings.xml

@@ -91,7 +91,7 @@
     <string name="icon_shape_corner">Forma de esquina</string>
     <string name="icon_shape_corner_round">Redondo</string>
     <string name="icon_shape_corner_squircle">Suavizado</string>
-    <string name="icon_shape_corner_cut">Cortar</string>
+    <string name="icon_shape_corner_cut">Cortado</string>
     <string name="icon_shape_top_left">Superior izquierda</string>
     <string name="icon_shape_top_right">Superior derecha</string>
     <string name="icon_shape_bottom_left">Inferior izquierda</string>
@@ -346,7 +346,7 @@
     <string name="action_share">Compartir</string>
     <string name="action_lens">Lens</string>
     <string name="recents_clear_all">Borrar todo</string>
-    <string name="task_menu_force_stop">Force close</string>
+    <string name="task_menu_force_stop">Forzar la detención</string>
     <string name="window_corner_radius_label">Radio de esquina de la pantalla</string>
     <string name="override_window_corner_radius_label">Radio de esquina de la pantalla personalizado</string>
     <string name="window_corner_radius_description">Cuando deslizas hacia abajo para abrir Recientes, la aplicación actual sigue tu dedo, encogiéndose en una tarjeta. Utiliza este control deslizante para ajustar el radio de esquina de la tarjeta cuando es casi de pantalla completa de tal forma que coincida con las esquinas de tu pantalla.</string>
@@ -444,8 +444,8 @@
     <string name="x_by_y">%1$d × %2$d</string>
     <string name="x_and_y">%s &amp; %s</string>
     <string name="system_settings">Ajustes del sistema</string>
-    <string name="action_unlock">Unlock</string>
-    <string name="action_lock">Lock</string>
-    <string name="recents_lock_unlock">Lock/Unlock</string>
-    <string name="recents_lock_unlock_description">Prevent selected app from clearing when using \"Clear All\"</string>
+    <string name="action_unlock">Desbloquear</string>
+    <string name="action_lock">Bloquear</string>
+    <string name="recents_lock_unlock">Bloquear/Desbloquear</string>
+    <string name="recents_lock_unlock_description">Evita que la app seleccionada se borre cuando se usa \"Limpiar todo\"</string>
 </resources>

lawnchair/res/values-hi-rIN/strings.xml

@@ -170,7 +170,7 @@
     <string name="minus_one_unavailable">कोई फ़ीड स्थापित नहीं है।</string>
     <string name="minus_one">ख़बर</string>
     <string name="feed_provider">Feed Provider</string>
-    <string name="feed_default">Default</string>
+    <string name="feed_default">पहले जैसा</string>
     <string name="wallpaper">वॉलपेपर</string>
     <string name="wallpaper_scrolling_label">स्क्रॉल वॉलपेपर</string>
     <string name="wallpaper_depth_effect_label">वॉलपेपर गहराई प्रभाव</string>
@@ -190,7 +190,7 @@
     <string name="popup_menu">पॉपअप मेनू</string>
     <string name="home_screen_lock_toggle_from_home_popup">लॉक बटन दिखाएं</string>
     <string name="show_system_settings_entry">सिस्टम सेटिंग्स की प्रविष्टि दिखाएं</string>
-    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
+    <string name="home_screen_edit_toggle_from_home_popup">एडिट बटन दिखाएँ</string>
     <string name="status_bar_label">स्टेटस बार</string>
     <string name="show_status_bar">स्टेट्स बार दिखाएँ</string>
     <string name="dark_status_bar_label">गहरा स्टेट्स बार</string>
@@ -247,7 +247,7 @@
     <string name="smartspace_mode_google_search">गूगल खोज</string>
     <!-- DockPreferences -->
     <!-- <string name="dock_label" /> -->
-    <string name="show_hotseat_title">Show Dock</string>
+    <string name="show_hotseat_title">डॉक दिखाएं</string>
     <string name="hotseat_mode_label">सर्च बार विजेट</string>
     <string name="hotseat_mode_disabled">अक्षम करें</string>
     <string name="hotseat_mode_lawnchair">Lawnchair</string>
@@ -288,7 +288,7 @@
     <string name="max_settings_entry_result_count_title">Max Settings Entry Result Count</string>
     <string name="max_recent_result_count_title">Max History Result Count</string>
     <string name="max_web_suggestion_delay">Max Web Suggestion Delay</string>
-    <string name="clear_history">Clear</string>
+    <string name="clear_history">साफ करें</string>
     <!-- <string name="grid" /> -->
     <string name="app_drawer_columns">ऐप ड्रॉअर कॉलम</string>
     <string name="row_height_label">रॉ की ऊंचाई</string>
@@ -299,7 +299,7 @@
     <string name="pref_suggestion_title">Web suggestions (via <xliff:g id="startpage">Startpage</xliff:g>)</string>
     <string name="pref_advance_search_category">Advanced Search</string>
     <string name="perform_wide_search_description">Search your contacts, files, and settings in app drawer search.</string>
-    <string name="pref_recent_suggestion_title">History</string>
+    <string name="pref_recent_suggestion_title">इतिहास</string>
     <!--
     <string name="icons" />
       <string name="icon_size" />
@@ -346,7 +346,7 @@
     <string name="action_share">शेयर करें</string>
     <string name="action_lens">लैंस</string>
     <string name="recents_clear_all">सभी हटाएं</string>
-    <string name="task_menu_force_stop">Force close</string>
+    <string name="task_menu_force_stop">बलपूर्वक बंद करें</string>
     <string name="window_corner_radius_label">स्क्रीन के किनारों का दायरा</string>
     <string name="override_window_corner_radius_label">स्वानुसार स्क्रीन के किनारों का दायरा</string>
     <string name="window_corner_radius_description">जब आप रिसेंटस स्क्रीन खोलने के लिए ऊपर स्वाइप करते हैं तब चालू ऐप आपकी ऊंगली के हिसाब से छोटा होते हुए कार्ड में बदल जाता है। इस स्लाइडर का उपयोग करके आप उस कार्ड के किनारों को अपने फोन के किनारों के समान कर सकते हैं।</string>
@@ -416,8 +416,8 @@
     <string name="all_apps_search_market_message">और ऐप खोजें</string>
     <string name="all_apps_search_startpage_message">Search on <xliff:g id="startpage">Startpage</xliff:g></string>
     <string name="error_no_market_or_browser_installed">कोई ऐप स्टोर या ब्राउज़र उपस्थित नहीं है|</string>
-    <string name="all_apps_search_result_suggestions">From the web</string>
-    <string name="all_apps_search_result_contacts_from_device">From your contacts</string>
+    <string name="all_apps_search_result_suggestions">वेब से</string>
+    <string name="all_apps_search_result_contacts_from_device">आपके संपर्कों से</string>
     <string name="all_apps_search_result_files">From your files</string>
     <string name="all_apps_search_result_settings_entry_from_device">From your settings</string>
     <string name="warn_contact_permission_content">Requires contact permission</string>

lawnchair/res/values-nl-rNL/strings.xml

@@ -169,7 +169,7 @@
     <string name="minus_one_enable">Toon feed</string>
     <string name="minus_one_unavailable">Geen feed geïnstalleerd.</string>
     <string name="minus_one">Feed</string>
-    <string name="feed_provider">Feed Provider</string>
+    <string name="feed_provider">Feed Aanbieder</string>
     <string name="feed_default">Standaard</string>
     <string name="wallpaper">Achtergrond</string>
     <string name="wallpaper_scrolling_label">Scrollende achtergrond</string>
@@ -183,14 +183,14 @@
     <string name="home_screen_unlock">Startscherm ontgrendelen</string>
     <!-- used in popup menu-->
     <string name="home_screen_locked">Startscherm is vergrendeld.</string>
-    <string name="show_dot_pagination_label">Show dot pagination</string>
-    <string name="show_dot_pagination_description">Enable showing dot pagination in workspace.</string>
-    <string name="show_material_u_popup_label">Show Material U Popup</string>
+    <string name="show_dot_pagination_label">Toon stip-paginering</string>
+    <string name="show_dot_pagination_description">Inschakelen tonen stip-paginering in werkruimte</string>
+    <string name="show_material_u_popup_label">Toon \"Materiaal U\" Popup</string>
     <string name="show_material_u_popup_description">Enable bouncy and slightly consolidated popup.</string>
     <string name="popup_menu">Pop-up Menu</string>
     <string name="home_screen_lock_toggle_from_home_popup">Vergrendelingsknop Tonen</string>
     <string name="show_system_settings_entry">Toon Systeeminstellingeninvoer</string>
-    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
+    <string name="home_screen_edit_toggle_from_home_popup">Toon bewerkingsknop</string>
     <string name="status_bar_label">Statusbalk</string>
     <string name="show_status_bar">Statusbalk weergeven</string>
     <string name="dark_status_bar_label">Donkere Status Balk</string>
@@ -247,7 +247,7 @@
     <string name="smartspace_mode_google_search">Google Zoeken</string>
     <!-- DockPreferences -->
     <!-- <string name="dock_label" /> -->
-    <string name="show_hotseat_title">Show Dock</string>
+    <string name="show_hotseat_title">Dock tonen</string>
     <string name="hotseat_mode_label">Zoekbalkwidget</string>
     <string name="hotseat_mode_disabled">Uitgeschakeld</string>
     <string name="hotseat_mode_lawnchair">Lawnchair</string>

lawnchair/res/values-pt-rPT/strings.xml

@@ -444,8 +444,8 @@
     <string name="x_by_y">%1$d x %2$d</string>
     <string name="x_and_y">%s &amp; %s</string>
     <string name="system_settings">Definições de Sistema</string>
-    <string name="action_unlock">Unlock</string>
-    <string name="action_lock">Lock</string>
-    <string name="recents_lock_unlock">Lock/Unlock</string>
-    <string name="recents_lock_unlock_description">Prevent selected app from clearing when using \"Clear All\"</string>
+    <string name="action_unlock">Desbloquear</string>
+    <string name="action_lock">Bloquear</string>
+    <string name="recents_lock_unlock">Bloquear/Desbloquear</string>
+    <string name="recents_lock_unlock_description">Impedir que a aplicação selecionada limpe ao usar \"Limpar Tudo\"</string>
 </resources>

lawnchair/res/values-ru-rRU/strings.xml

@@ -348,7 +348,7 @@
     <string name="action_share">Поделиться</string>
     <string name="action_lens">Lens</string>
     <string name="recents_clear_all">Очистить все</string>
-    <string name="task_menu_force_stop">Force close</string>
+    <string name="task_menu_force_stop">Принудительно закрыть</string>
     <string name="window_corner_radius_label">Радиус скругления краёв экрана</string>
     <string name="override_window_corner_radius_label">Задать радиус скругления краёв экрана</string>
     <string name="window_corner_radius_description">Когда вы проводите вверх, чтобы открыть Недавние, текущее приложение следует за пальцем, уменьшаясь в карточку. Используйте этот ползунок для настройки радиуса угла карточки, когда она почти развернута, чтобы она соответствовала углам экрана.</string>
@@ -446,8 +446,8 @@
     <string name="x_by_y">%1$d × %2$d</string>
     <string name="x_and_y">%s &amp; %s</string>
     <string name="system_settings">Системные настройки</string>
-    <string name="action_unlock">Unlock</string>
-    <string name="action_lock">Lock</string>
-    <string name="recents_lock_unlock">Lock/Unlock</string>
-    <string name="recents_lock_unlock_description">Prevent selected app from clearing when using \"Clear All\"</string>
+    <string name="action_unlock">Разблокировать</string>
+    <string name="action_lock">Заблокировать</string>
+    <string name="recents_lock_unlock">Блокировка/Разблокировка</string>
+    <string name="recents_lock_unlock_description">Запретить очистку выбранного приложения при использовании \"Очистить все\"</string>
 </resources>

lawnchair/res/values-uk-rUA/strings.xml

@@ -183,8 +183,8 @@
     <string name="home_screen_unlock">Розблокувати домашній екран</string>
     <!-- used in popup menu-->
     <string name="home_screen_locked">Домашній екран заблоковано.</string>
-    <string name="show_dot_pagination_label">Show dot pagination</string>
-    <string name="show_dot_pagination_description">Enable showing dot pagination in workspace.</string>
+    <string name="show_dot_pagination_label">Показувати точкову нумерацію сторінок</string>
+    <string name="show_dot_pagination_description">Активувати точкову нумерацію сторінок на домашньому екрані.</string>
     <string name="show_material_u_popup_label">Показувати cпливаюче меню Material You</string>
     <string name="show_material_u_popup_description">Показувати cпливаюче мені Material You.</string>
     <string name="popup_menu">Спливаюче меню</string>
@@ -247,7 +247,7 @@
     <string name="smartspace_mode_google_search">Пошук Google</string>
     <!-- DockPreferences -->
     <!-- <string name="dock_label" /> -->
-    <string name="show_hotseat_title">Show Dock</string>
+    <string name="show_hotseat_title">Показати док-панель</string>
     <string name="hotseat_mode_label">Віджет панелі пошуку</string>
     <string name="hotseat_mode_disabled">Вимкнено</string>
     <string name="hotseat_mode_lawnchair">Lawnchair</string>
@@ -348,7 +348,7 @@
     <string name="action_share">Поділитись</string>
     <string name="action_lens">Lens</string>
     <string name="recents_clear_all">Очистити все</string>
-    <string name="task_menu_force_stop">Force close</string>
+    <string name="task_menu_force_stop">Примусово закрити</string>
     <string name="window_corner_radius_label">Радіус кута екрану</string>
     <string name="override_window_corner_radius_label">Користувацький радіус кута екрана</string>
     <string name="window_corner_radius_description">Проведіть пальцем угору, щоб відкрити Нещодавні, поточний додаток слідує за вашим пальцем, стихаючи на картці. Використовуйте цей повзунок, щоб налаштувати радіус кута карти, коли він майже повноекранний режим, так щоб він співпадав з кутами вашого екрану.</string>
@@ -446,8 +446,8 @@
     <string name="x_by_y">%1$d × %2$d</string>
     <string name="x_and_y">%s &amp; %s</string>
     <string name="system_settings">Системні налаштування</string>
-    <string name="action_unlock">Unlock</string>
-    <string name="action_lock">Lock</string>
-    <string name="recents_lock_unlock">Lock/Unlock</string>
-    <string name="recents_lock_unlock_description">Prevent selected app from clearing when using \"Clear All\"</string>
+    <string name="action_unlock">Розблокувати</string>
+    <string name="action_lock">Заблокувати</string>
+    <string name="recents_lock_unlock">Заблокувати/Розблокувати</string>
+    <string name="recents_lock_unlock_description">Не закривати вибрані застосунки при натисканні \"Закрити всі\"</string>
 </resources>

lawnchair/res/values-zh-rCN/strings.xml

@@ -183,14 +183,14 @@
     <string name="home_screen_unlock">解锁主屏幕布局</string>
     <!-- used in popup menu-->
     <string name="home_screen_locked">主屏幕已锁定。</string>
-    <string name="show_dot_pagination_label">Show dot pagination</string>
-    <string name="show_dot_pagination_description">Enable showing dot pagination in workspace.</string>
-    <string name="show_material_u_popup_label">Show Material U Popup</string>
+    <string name="show_dot_pagination_label">显示点分页</string>
+    <string name="show_dot_pagination_description">在工作区中显示点分页。</string>
+    <string name="show_material_u_popup_label">使用 Material You 风格弹出窗口</string>
     <string name="show_material_u_popup_description">Enable bouncy and slightly consolidated popup.</string>
     <string name="popup_menu">弹出菜单</string>
     <string name="home_screen_lock_toggle_from_home_popup">显示锁定桌面按钮</string>
     <string name="show_system_settings_entry">显示系统设置项目</string>
-    <string name="home_screen_edit_toggle_from_home_popup">Show Edit Button</string>
+    <string name="home_screen_edit_toggle_from_home_popup">显示编辑按钮</string>
     <string name="status_bar_label">状态栏</string>
     <string name="show_status_bar">显示状态栏</string>
     <string name="dark_status_bar_label">深色状态栏</string>
@@ -247,7 +247,7 @@
     <string name="smartspace_mode_google_search">Google 搜索</string>
     <!-- DockPreferences -->
     <!-- <string name="dock_label" /> -->
-    <string name="show_hotseat_title">Show Dock</string>
+    <string name="show_hotseat_title">显示 Dock 栏</string>
     <string name="hotseat_mode_label">搜索栏小部件</string>
     <string name="hotseat_mode_disabled">已禁用</string>
     <string name="hotseat_mode_lawnchair">Lawnchair</string>
@@ -345,7 +345,7 @@
     <string name="action_share">分享</string>
     <string name="action_lens">智能镜头</string>
     <string name="recents_clear_all">全部清除</string>
-    <string name="task_menu_force_stop">Force close</string>
+    <string name="task_menu_force_stop">强制关闭</string>
     <string name="window_corner_radius_label">屏幕圆角半径</string>
     <string name="override_window_corner_radius_label">自定义屏幕圆角半径</string>
     <string name="window_corner_radius_description">当您向上滑动以打开最近应用菜单时，当前应用程序显示会跟随您的手指移动。 使用滑块以调整卡片的圆角半径，使它接近全屏，贴合您屏幕的边缘。</string>
@@ -443,8 +443,8 @@
     <string name="x_by_y">%1$d × %2$d</string>
     <string name="x_and_y">%s &amp; %s</string>
     <string name="system_settings">系统设置</string>
-    <string name="action_unlock">Unlock</string>
-    <string name="action_lock">Lock</string>
-    <string name="recents_lock_unlock">Lock/Unlock</string>
+    <string name="action_unlock">解锁</string>
+    <string name="action_lock">锁定</string>
+    <string name="recents_lock_unlock">锁定/解锁</string>
     <string name="recents_lock_unlock_description">Prevent selected app from clearing when using \"Clear All\"</string>
 </resources>

lawnchair/res/values/config.xml

@@ -90,6 +90,7 @@
     <bool name="config_default_rounded_widgets">true</bool>
     <bool name="config_default_allow_widget_overlap">false</bool>
     <bool name="config_default_show_status_bar">true</bool>
+    <bool name="config_default_remember_position">false</bool>
     <bool name="config_default_show_top_shadow">true</bool>
     <bool name="config_default_lock_home_screen">false</bool>
     <bool name="config_default_lock_home_screen_on_popup">false</bool>