Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/upstream' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
Goooler committed Feb 8, 2024
2 parents 7cb55e7 + 30f4cd3 commit 28eaa08
Show file tree
Hide file tree
Showing 55 changed files with 350 additions and 27 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
java-version: 21
- uses: gradle/actions/setup-gradle@v3
with:
cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
gradle-home-cache-cleanup: true
- run: ./gradlew assembleLawnWithQuickstepRelease
- uses: actions/upload-artifact@v4
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = "1.5.8"
kotlinCompilerExtensionVersion = "1.5.9"
}

final def keystorePropertiesFile = rootProject.file("keystore.properties")
Expand Down Expand Up @@ -338,7 +338,7 @@ dependencies {
implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
implementation 'dev.rikka.tools.refine:runtime:4.4.0'

implementation platform("androidx.compose:compose-bom:2024.01.00")
implementation platform("androidx.compose:compose-bom:2024.02.00")
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.ui:ui-util"
debugImplementation "androidx.compose.ui:ui-tooling"
Expand All @@ -351,7 +351,7 @@ dependencies {
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.activity:activity-compose:1.8.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
implementation "androidx.navigation:navigation-compose:2.7.6"
implementation "androidx.navigation:navigation-compose:2.7.7"
implementation "androidx.palette:palette-ktx:1.0.0"
implementation "androidx.slice:slice-core:1.1.0-alpha02"
def accompanistVersion = '0.34.0'
Expand Down
6 changes: 6 additions & 0 deletions lawnchair/res/values-af-rZA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@
<string name="home_screen_unlock">Ontsluit tuisskerm</string>
<!-- used in popup menu-->
<string name="home_screen_locked">Home Screen is 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_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">Show Lock Button</string>
<string name="show_system_settings_entry">Show System Settings Entry</string>
Expand Down Expand Up @@ -283,13 +287,15 @@
<string name="max_suggestion_result_count_title">Max Suggestion Result Count</string>
<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="grid" /> -->
<string name="app_drawer_columns">Programlaaikolomme</string>
<string name="row_height_label">Ry Hoogte</string>
<string name="app_drawer_indent_label">Horizontal Padding</string>
<string name="perform_wide_search_title">Device Search</string>
<string name="perform_wide_search_file">Files</string>
<string name="pref_suggestion_label">Voorstelle</string>
<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>
Expand Down
6 changes: 6 additions & 0 deletions lawnchair/res/values-am-rET/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@
<string name="home_screen_unlock">Unlock Home Screen</string>
<!-- used in popup menu-->
<string name="home_screen_locked">Home Screen is 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_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">Show Lock Button</string>
<string name="show_system_settings_entry">Show System Settings Entry</string>
Expand Down Expand Up @@ -283,13 +287,15 @@
<string name="max_suggestion_result_count_title">Max Suggestion Result Count</string>
<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="grid" /> -->
<string name="app_drawer_columns">App Drawer Columns</string>
<string name="row_height_label">Row Height</string>
<string name="app_drawer_indent_label">Horizontal Padding</string>
<string name="perform_wide_search_title">Device Search</string>
<string name="perform_wide_search_file">Files</string>
<string name="pref_suggestion_label">Suggestions</string>
<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>
Expand Down
6 changes: 6 additions & 0 deletions lawnchair/res/values-ar-rSA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@
<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_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>
Expand Down Expand Up @@ -283,13 +287,15 @@
<string name="max_suggestion_result_count_title">Max Suggestion Result Count</string>
<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">مسح</string>
<!-- <string name="grid" /> -->
<string name="app_drawer_columns">أعمدة قائمة التطبيقات</string>
<string name="row_height_label">ارتفاع الصف</string>
<string name="app_drawer_indent_label">Horizontal Padding</string>
<string name="perform_wide_search_title">بحث الجهاز</string>
<string name="perform_wide_search_file">ملفات</string>
<string name="pref_suggestion_label">اقتراحات</string>
<string name="pref_suggestion_title">اقتراحات الويب(عبر <xliff:g id="startpage">Startpage</xliff:g>)</string>
<string name="pref_advance_search_category">بحث متقدم</string>
<string name="perform_wide_search_description">البحث في جهات اتصالك، ملفاتك و إعداداتك في بحث درج التطبيقات.</string>
Expand Down
6 changes: 6 additions & 0 deletions lawnchair/res/values-b+sr+Latn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@
<string name="home_screen_unlock">Otključaj početni ekran</string>
<!-- used in popup menu-->
<string name="home_screen_locked">Početni ekran je zaključan.</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_material_u_popup_description">Enable bouncy and slightly consolidated popup.</string>
<string name="popup_menu">Iskačući meni</string>
<string name="home_screen_lock_toggle_from_home_popup">Prikaži dugme za zaključavanje</string>
<string name="show_system_settings_entry">Prikaži sistemsko podešavanje</string>
Expand Down Expand Up @@ -283,13 +287,15 @@
<string name="max_suggestion_result_count_title">Maksimalan broj rezultata predloga</string>
<string name="max_settings_entry_result_count_title">Maksimalan broj rezultata podešavanja</string>
<string name="max_recent_result_count_title">Maksimalan broj rezultata istorije</string>
<string name="max_web_suggestion_delay">Max Web Suggestion Delay</string>
<string name="clear_history">Obriši</string>
<!-- <string name="grid" /> -->
<string name="app_drawer_columns">Broj kolona na listi aplikacija</string>
<string name="row_height_label">Visina reda</string>
<string name="app_drawer_indent_label">Horizontalni razmak</string>
<string name="perform_wide_search_title">Pretraga uređaja</string>
<string name="perform_wide_search_file">Fajlovi</string>
<string name="pref_suggestion_label">Predlozi</string>
<string name="pref_suggestion_title">Veb-predlozi (pomoću usluge <xliff:g id="startpage">Startpage</xliff:g>)</string>
<string name="pref_advance_search_category">Napredna pretraga</string>
<string name="perform_wide_search_description">Pretražujte kontakte, fajlove i podešavanja na listi aplikacija.</string>
Expand Down
6 changes: 6 additions & 0 deletions lawnchair/res/values-bn-rBD/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@
<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_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>
Expand Down Expand Up @@ -283,13 +287,15 @@
<string name="max_suggestion_result_count_title">Max Suggestion Result Count</string>
<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="grid" /> -->
<string name="app_drawer_columns">অ্যাপ ড্রয়ারের কলাম</string>
<string name="row_height_label">সারির উচ্চতা</string>
<string name="app_drawer_indent_label">Horizontal Padding</string>
<string name="perform_wide_search_title">Device Search</string>
<string name="perform_wide_search_file">Files</string>
<string name="pref_suggestion_label">পরামর্শ</string>
<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>
Expand Down
14 changes: 10 additions & 4 deletions lawnchair/res/values-ca-rES/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@
<!-- <string name="gesture_double_tap" /> -->
<string name="minus_one_enable">Canal de notícies</string>
<string name="minus_one_unavailable">No hi ha cap Feed instal·lat.</string>
<string name="feed_provider">Feed Provider</string>
<string name="feed_default">Default</string>
<string name="feed_provider">Proveïdor de feed</string>
<string name="feed_default">Predeterminat</string>
<string name="wallpaper">Fons de pantalla</string>
<string name="wallpaper_scrolling_label">Desplaçament de fons de pantalla</string>
<string name="wallpaper_depth_effect_label">Efecte de profunditat del fons de pantalla</string>
Expand All @@ -183,6 +183,10 @@
<string name="home_screen_unlock">Desbloquejar Pantalla Inicial</string>
<!-- used in popup menu-->
<string name="home_screen_locked">La pantalla principal està bloquejada.</string>
<string name="show_dot_pagination_label">Mostrar punt de paginació</string>
<string name="show_dot_pagination_description">Activar mostrar paginació amb un punt en la zona de treball.</string>
<string name="show_material_u_popup_label">Mostrar Popup de Material U</string>
<string name="show_material_u_popup_description">Activar finestra emergent lleugerament consolidada i elàstica.</string>
<string name="popup_menu">Menú emergent</string>
<string name="home_screen_lock_toggle_from_home_popup">Mostrar botó de bloqueig</string>
<string name="show_system_settings_entry">Mostrar entrada de la configuració del sistema</string>
Expand Down Expand Up @@ -252,7 +256,7 @@
<string name="corner_radius_label">Radi de cantonada</string>
<string name="apply_accent_color_label">Aplica el color d\'èmfasi</string>
<string name="search_provider">Proveïdor del cercador</string>
<string name="hotseat_bottom_space_label">Bottom Padding</string>
<string name="hotseat_bottom_space_label">Farcit inferior</string>
<string name="grid">Graella</string>
<string name="dock_icons">Icones del Dock</string>
<!-- SearchProviderPreferences -->
Expand Down Expand Up @@ -283,13 +287,15 @@
<string name="max_suggestion_result_count_title">Màxim Nombre De Persones</string>
<string name="max_settings_entry_result_count_title">Màxim Nombre d\'Entrades de Configuració</string>
<string name="max_recent_result_count_title">Màxim Nombre de Resultats de l\'Historial</string>
<string name="max_web_suggestion_delay">Màxim retard per a suggeriment Web</string>
<string name="clear_history">Netejar</string>
<!-- <string name="grid" /> -->
<string name="app_drawer_columns">Columnes del calaix d\'aplicacions</string>
<string name="row_height_label">Alçada de fila</string>
<string name="app_drawer_indent_label">Horizontal Padding</string>
<string name="app_drawer_indent_label">Farcit Horitzontal</string>
<string name="perform_wide_search_title">Recerca del dispositiu</string>
<string name="perform_wide_search_file">Arxius</string>
<string name="pref_suggestion_label">Suggeriments</string>
<string name="pref_suggestion_title">Suggerències web (via: <xliff:g id="startpage">Startpage</xliff:g>)</string>
<string name="pref_advance_search_category">Cerca avançada</string>
<string name="perform_wide_search_description">Buscar els teus contactes, arxius i configuracions en el cercador del calaix d\'aplicacions.</string>
Expand Down
6 changes: 6 additions & 0 deletions lawnchair/res/values-cs-rCZ/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@
<string name="home_screen_unlock">Odemknout domovskou obrazovku</string>
<!-- used in popup menu-->
<string name="home_screen_locked">Domovská obrazovka je uzamčena.</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_material_u_popup_description">Enable bouncy and slightly consolidated popup.</string>
<string name="popup_menu">Vyskakovací nabídka</string>
<string name="home_screen_lock_toggle_from_home_popup">Zobrazit tlačítko uzamčení</string>
<string name="show_system_settings_entry">Zobrazit položku nastavení systému</string>
Expand Down Expand Up @@ -283,13 +287,15 @@
<string name="max_suggestion_result_count_title">Max Suggestion Result Count</string>
<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="grid" /> -->
<string name="app_drawer_columns">Sloupce seznamu aplikací</string>
<string name="row_height_label">Výška řádku</string>
<string name="app_drawer_indent_label">Vodorovná mezera</string>
<string name="perform_wide_search_title">Device Search</string>
<string name="perform_wide_search_file">Files</string>
<string name="pref_suggestion_label">Návrhy</string>
<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>
Expand Down
6 changes: 6 additions & 0 deletions lawnchair/res/values-da-rDK/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@
<string name="home_screen_unlock">Unlock Home Screen</string>
<!-- used in popup menu-->
<string name="home_screen_locked">Home Screen is 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_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">Show Lock Button</string>
<string name="show_system_settings_entry">Show System Settings Entry</string>
Expand Down Expand Up @@ -283,13 +287,15 @@
<string name="max_suggestion_result_count_title">Max Suggestion Result Count</string>
<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="grid" /> -->
<string name="app_drawer_columns">App skuffe kolonner</string>
<string name="row_height_label">Row Height</string>
<string name="app_drawer_indent_label">Horizontal Padding</string>
<string name="perform_wide_search_title">Device Search</string>
<string name="perform_wide_search_file">Files</string>
<string name="pref_suggestion_label">Suggestions</string>
<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>
Expand Down
Loading

0 comments on commit 28eaa08

Please sign in to comment.