Skip to content

Commit bf71a23

Browse files
authored
Merge branch 'LawnchairLauncher:15-dev' into trunk
2 parents 2a9e63b + 64e8e9b commit bf71a23

File tree

8 files changed

+66
-65
lines changed

8 files changed

+66
-65
lines changed

build.gradle

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import com.android.build.gradle.api.AndroidBasePlugin
33
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
44

55
plugins {
6-
id 'com.android.application' version "8.8.1"
7-
id 'com.android.library' version "8.8.1" apply false
8-
id 'com.android.test' version '8.8.1' apply false
6+
id 'com.android.application' version "8.9.0"
7+
id 'com.android.library' version "8.9.0" apply false
8+
id 'com.android.test' version '8.9.0' apply false
99
id 'androidx.baselineprofile' version '1.3.3'
1010
id 'org.jetbrains.kotlin.android' version "2.1.10"
1111
id 'org.jetbrains.kotlin.plugin.compose' version "2.1.10"
1212
id 'org.jetbrains.kotlin.plugin.parcelize' version "2.1.10"
1313
id 'org.jetbrains.kotlin.plugin.serialization' version "2.1.10"
14-
id "com.google.devtools.ksp" version "2.1.10-1.0.30"
14+
id "com.google.devtools.ksp" version "2.1.10-1.0.31"
1515
id 'com.google.protobuf' version "0.9.4"
1616
id 'app.cash.licensee' version "1.12.0"
1717
id 'dev.rikka.tools.refine' version "4.4.0"
@@ -42,7 +42,7 @@ allprojects {
4242
}
4343

4444
plugins.withId('com.google.protobuf') {
45-
def protocVersion = '4.29.3'
45+
def protocVersion = '4.30.0'
4646
protobuf {
4747
// Configure the protoc executable
4848
protoc {
@@ -360,10 +360,10 @@ dependencies {
360360
implementation "androidx.compose.runtime:runtime-livedata"
361361
implementation 'androidx.compose.material3:material3'
362362
implementation 'androidx.compose.material3:material3-window-size-class'
363-
implementation "androidx.activity:activity-compose:1.10.0"
363+
implementation "androidx.activity:activity-compose:1.10.1"
364364
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7"
365365
implementation "androidx.navigation:navigation-compose:2.8.0"
366-
implementation "androidx.constraintlayout:constraintlayout:2.2.0"
366+
implementation "androidx.constraintlayout:constraintlayout:2.2.1"
367367
implementation "androidx.palette:palette-ktx:1.0.0"
368368
implementation "androidx.slice:slice-core:1.1.0-alpha02"
369369
def accompanistVersion = '0.37.2'
@@ -379,7 +379,7 @@ dependencies {
379379
implementation "com.patrykmichalik.opto:domain:$optoVersion"
380380
implementation "com.patrykmichalik.opto:core:$optoVersion"
381381
implementation "com.patrykmichalik.opto:compose:$optoVersion"
382-
implementation "androidx.datastore:datastore-preferences:1.1.2"
382+
implementation "androidx.datastore:datastore-preferences:1.1.3"
383383
def retrofitVersion = "2.11.0"
384384
implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
385385
implementation "com.squareup.retrofit2:converter-kotlinx-serialization:$retrofitVersion"
@@ -394,7 +394,7 @@ dependencies {
394394
// Persian Date
395395
implementation 'com.github.samanzamani:PersianDate:1.7.1'
396396

397-
implementation 'com.airbnb.android:lottie:6.6.2'
397+
implementation 'com.airbnb.android:lottie:6.6.3'
398398

399399
// Compose drag and drop library
400400
implementation 'sh.calvin.reorderable:reorderable:2.4.3'

lawnchair/res/values-de-rDE/strings.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
<string name="action_copy">Kopieren</string>
3939
<string name="action_paste">Einfügen</string>
4040
<string name="action_done">Erledigt</string>
41-
<string name="select_all">Select all</string>
42-
<string name="deselect_all">Deselect all</string>
43-
<string name="inverse_selection">Inverse selection</string>
41+
<string name="select_all">Alle auswählen</string>
42+
<string name="deselect_all">Alle abwählen</string>
43+
<string name="inverse_selection">Auswahl umkehren</string>
4444
<string name="loading">Laden…</string>
45-
<string name="download_update">Download update</string>
46-
<string name="install_update">Install update</string>
47-
<string name="pro_updated">You\'re up-to-date!</string>
45+
<string name="download_update">Update laden</string>
46+
<string name="install_update">Update installieren</string>
47+
<string name="pro_updated">Du verwendest die neuste Version!</string>
4848
<string name="managed_by_lawnchair">Von Lawnchair verwaltet</string>
4949
<!-- When mentioning settings UI -->
5050
<string name="smartspace_preferences">Voreinstellungen</string>
@@ -94,22 +94,22 @@
9494
<string name="folder_list_note">Zum Bearbeiten nach links, zum Löschen nach rechts wischen oder zum Aktualisieren der Elemente tippen</string>
9595
<string name="apps_in_folder_label">Ordner-Apps ausblenden</string>
9696
<string name="apps_in_folder_description">Ordnern zugewiesene Apps sind von der App-Liste ausgeschlossen</string>
97-
<string name="folders_filter_duplicates">Only show unique apps</string>
97+
<string name="folders_filter_duplicates">Nur Apps, die keine Duplikate sind, zeigen</string>
9898
<string name="my_folder_label">Mein Ordner</string>
9999
<!-- A11y description -->
100-
<string name="accessibility_service_description">To perform certain actions (such as locking your phone) when performing a gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, or to open Recents, Lawnchair uses the performGlobalAction Accessibility service.</string>
100+
<string name="accessibility_service_description">Um bestimmte Aktionen (bspw. das Mobiltelefon sperren) auszuführen, wenn eine Geste ausgeführt wird, benötigt Lawnchair Bedienungshilfen-Zugriff.\n\nLawnchair nimmt keine deiner Aktionen auf, jedoch ist die Berechtigung, dies zu tun, teil des Bedienungshilfen-Zugriffes. Lawnchair löscht jedes Ereigniss, das vom System gesendet wird.\n\nUm das Gerät zu sperren, oder die zulezt geöffneten Apps zu öffnen, wird der performGlobalAction Bedienungshilfen-Service verwendet.</string>
101101
<string name="x_with_y_count">%1$s (%2$d)</string>
102102
<string name="x_by_y">%1$d × %2$d</string>
103103
<string name="x_and_y">%1$s &amp; %2$s</string>
104-
<string name="advanced">Advanced</string>
104+
<string name="advanced">Erweitert</string>
105105
<!--
106106
107107
Preference Dashboard
108108
109109
-->
110110
<string name="settings">Einstellungen</string>
111111
<string name="general_label">Allgemein</string>
112-
<string name="general_description">Farben, Symbolpaket, Benachrichtigungspunkte</string>
112+
<string name="general_description">Farben, Symbolpaket, Benachrichtigungs-Punkte</string>
113113
<string name="home_screen_label">Startbildschirm</string>
114114
<string name="home_screen_description">Feed, Raster, Symbole</string>
115115
<string name="dock_label">Dock</string>
@@ -372,8 +372,8 @@
372372
<string name="gesture_swipe_down">Nach unten wischen</string>
373373
<string name="gesture_home_tap">Home-Schaltfläche</string>
374374
<string name="gesture_back_tap">Zurück-Taste</string>
375-
<string name="gesture_swipe_left">Swipe left</string>
376-
<string name="gesture_swipe_right">Swipe right</string>
375+
<string name="gesture_swipe_left">Nach links wischen</string>
376+
<string name="gesture_swipe_right">Nach rechts wischen</string>
377377
<string name="gesture_handler_no_op">Nichts tun</string>
378378
<string name="gesture_handler_sleep">Ruhezustand</string>
379379
<string name="gesture_handler_recents">Öffne zuletzt genutzte Apps</string>
@@ -383,7 +383,7 @@
383383
<string name="gesture_handler_open_app_drawer">App-Übersicht öffnen</string>
384384
<string name="gesture_handler_open_app_search">App-Suche öffnen</string>
385385
<string name="gesture_handler_open_search">Suche öffnen</string>
386-
<string name="gesture_handler_open_assistant">Open assistant</string>
386+
<string name="gesture_handler_open_assistant">Assistent-App öffnen</string>
387387
<string name="pick_app_for_gesture">App auswählen</string>
388388
<string name="dt2s_admin_hint_title">Administrator-Berechtigungen erforderlich</string>
389389
<string name="dt2s_admin_hint">Um Doppeltippen zum Display Ausschalten zu verwenden, aktiviere Lawnchair als App zur Geräteverwaltung. Tippe auf \"Einstellungen öffnen\" und tippe auf „Diese App zur Geräteverwaltung aktivieren“.</string>
@@ -486,7 +486,7 @@
486486
<string name="paused_apps_drop_target_label">App anhalten</string>
487487
<string name="dock_icons">Dock-Symbole</string>
488488
<string name="hotseat_bottom_space_label">Unterer Abstand</string>
489-
<string name="page_indicator_height">Page indicator height</string>
489+
<string name="page_indicator_height">Seitenindikator-Höhe</string>
490490
<!-- Search providers -->
491491
<string name="search_provider_app_search">App-Suche</string>
492492
<string name="search_provider_sponsored_description">%1$s und Lawnchair haben eine Umsatzbeteiligungsvereinbarung.\n\nSuchen mit %1$s unterstützt Lawnchair.</string>

lawnchair/res/values-fr-rFR/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<string name="apply_label">Appliquer</string>
9393
<string name="delete_label">Supprimer</string>
9494
<string name="folder_list_note">Balayez vers la gauche pour modifier, balayez vers la droite pour supprimer, ou appuyez pour ajouter des éléments</string>
95-
<string name="apps_in_folder_label">Masquer les applis rangées dans des dossiers</string>
95+
<string name="apps_in_folder_label">Masquer les applis rangées dans un dossier</string>
9696
<string name="apps_in_folder_description">Les applis assignées à un dossier sont exclues des listes d\'applis</string>
9797
<string name="folders_filter_duplicates">Afficher seulement les applis uniques</string>
9898
<string name="my_folder_label">Mon dossier</string>

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

+17-17
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@
2121
Actions and Verbs
2222
2323
-->
24-
<string name="preview_label">Preview</string>
25-
<string name="action_create">Create</string>
26-
<string name="action_backup">Backup</string>
27-
<string name="action_restore">Restore</string>
28-
<string name="action_delete">Delete</string>
24+
<string name="preview_label">പ്രിവ്യൂ</string>
25+
<string name="action_create">സൃഷ്ടിക്കുക</string>
26+
<string name="action_backup">ബാക്കപ്പ്</string>
27+
<string name="action_restore">പുനഃസ്ഥാപിക്കുക</string>
28+
<string name="action_delete">ഇല്ലാതാക്കുക</string>
2929
<string name="action_reset">പുനഃക്രമീകരിക്കുക</string>
30-
<string name="action_unlock">Unlock</string>
31-
<string name="action_lock">Lock</string>
30+
<string name="action_unlock">അൺലോക്ക് ചെയ്യുക</string>
31+
<string name="action_lock">പൂട്ടുക</string>
3232
<string name="action_apply">പ്രയോഗിക്കുക</string>
3333
<string name="action_customize">ഇഷ്ടാനുസൃതമാക്കുക</string>
34-
<string name="always_choice">Always</string>
35-
<string name="never_choice">Never</string>
36-
<string name="clipboard">Clipboard</string>
37-
<string name="action_copy_link">Copy link</string>
34+
<string name="always_choice">എപ്പോഴും</string>
35+
<string name="never_choice">ഒരിക്കലും</string>
36+
<string name="clipboard">ക്ലിപ്പ്ബോർഡ്</string>
37+
<string name="action_copy_link">ലിങ്ക് പകർത്തുക</string>
3838
<string name="action_copy">കോപ്പി</string>
39-
<string name="action_paste">Paste</string>
39+
<string name="action_paste">പേസ്റ്റ്</string>
4040
<string name="action_done">ചെയ്തു</string>
41-
<string name="select_all">Select all</string>
42-
<string name="deselect_all">Deselect all</string>
43-
<string name="inverse_selection">Inverse selection</string>
41+
<string name="select_all">എല്ലാം തിരഞ്ഞെടുക്കുക</string>
42+
<string name="deselect_all">എല്ലാം തിരഞ്ഞെടുത്തത് മാറ്റുക</string>
43+
<string name="inverse_selection">വിപരീത തിരഞ്ഞെടുപ്പ്</string>
4444
<string name="loading">ലോഡ് ചെയുന്നു…</string>
45-
<string name="download_update">Download update</string>
45+
<string name="download_update">അപ്‌ഡേറ്റ് ഡൗൺലോഡ് ചെയ്യുക</string>
4646
<string name="install_update">Install update</string>
4747
<string name="pro_updated">You\'re up-to-date!</string>
4848
<string name="managed_by_lawnchair">Managed by Lawnchair</string>
@@ -95,7 +95,7 @@
9595
<string name="apps_in_folder_label">Hide folder apps</string>
9696
<string name="apps_in_folder_description">Apps assigned to folders are excluded from app lists</string>
9797
<string name="folders_filter_duplicates">Only show unique apps</string>
98-
<string name="my_folder_label">My folder</string>
98+
<string name="my_folder_label">എന്റെ ഫോൾഡർ</string>
9999
<!-- A11y description -->
100100
<string name="accessibility_service_description">To perform certain actions (such as locking your phone) when performing a gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, or to open Recents, Lawnchair uses the performGlobalAction Accessibility service.</string>
101101
<string name="x_with_y_count">%1$s (%2$d)</string>

lawnchair/res/values-pl-rPL/strings.xml

+16-16
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
<string name="action_copy">Kopiuj</string>
3939
<string name="action_paste">Wklej</string>
4040
<string name="action_done">Gotowe</string>
41-
<string name="select_all">Select all</string>
42-
<string name="deselect_all">Deselect all</string>
43-
<string name="inverse_selection">Inverse selection</string>
41+
<string name="select_all">Wybierz wszystko</string>
42+
<string name="deselect_all">Odznacz wszystko</string>
43+
<string name="inverse_selection">Odwróć wybór</string>
4444
<string name="loading">Ładowanie…</string>
45-
<string name="download_update">Download update</string>
46-
<string name="install_update">Install update</string>
47-
<string name="pro_updated">You\'re up-to-date!</string>
45+
<string name="download_update">Pobierz aktualizację</string>
46+
<string name="install_update">Zainstaluj aktualizację</string>
47+
<string name="pro_updated">Masz najnowszą wersję!</string>
4848
<string name="managed_by_lawnchair">Zarządzane przez Lawnchair</string>
4949
<!-- When mentioning settings UI -->
5050
<string name="smartspace_preferences">Ustawienia</string>
@@ -73,7 +73,7 @@
7373
<!-- Generic styling options -->
7474
<string name="wallpaper">Tapeta</string>
7575
<string name="style">Style</string>
76-
<string name="background_opacity">Przezroczystość tła</string>
76+
<string name="background_opacity">Zakrycie tła</string>
7777
<!-- Toast text and tips -->
7878
<string name="copied_toast">Skopiowano do schowka</string>
7979
<string name="calculator_search_result_copied_toast">Wynik został skopiowany do schowka</string>
@@ -85,7 +85,7 @@
8585
<string name="caddy">Caddy</string>
8686
<string name="app_drawer_folder">App drawer folders</string>
8787
<string name="app_drawer_folder_settings">Folder szuflady</string>
88-
<string name="add_folder">Create folder</string>
88+
<string name="add_folder">Utwórz folder</string>
8989
<string name="edit_folder">Edytuj folder</string>
9090
<string name="add_label">Dodaj</string>
9191
<string name="edit_label">Edytuj</string>
@@ -101,7 +101,7 @@
101101
<string name="x_with_y_count">%1$s (%2$d)</string>
102102
<string name="x_by_y">%1$d x %2$d</string>
103103
<string name="x_and_y">%1$s i %2$s</string>
104-
<string name="advanced">Advanced</string>
104+
<string name="advanced">Zaawansowane</string>
105105
<!--
106106
107107
Preference Dashboard
@@ -142,7 +142,7 @@
142142
<!--Overlay-->
143143
<string name="overlay_fade_in">Fade In</string>
144144
<string name="overlay_suck_in">Suck In</string>
145-
<string name="app_closing_animation">App closing animation</string>
145+
<string name="app_closing_animation">Animacja zamykania aplikacji</string>
146146
<string name="overlay_label">Overlay</string>
147147
<string name="overlay_none">None</string>
148148
<!--
@@ -372,8 +372,8 @@
372372
<string name="gesture_swipe_down">Przesunięcie w dół</string>
373373
<string name="gesture_home_tap">Przycisk ekranu głównego</string>
374374
<string name="gesture_back_tap">Przycisk wstecz</string>
375-
<string name="gesture_swipe_left">Swipe left</string>
376-
<string name="gesture_swipe_right">Swipe right</string>
375+
<string name="gesture_swipe_left">Przesuń w lewo</string>
376+
<string name="gesture_swipe_right">Przesuń w prawo</string>
377377
<string name="gesture_handler_no_op">Nic nie rób</string>
378378
<string name="gesture_handler_sleep">Uśpij</string>
379379
<string name="gesture_handler_recents">Otwórz widok ostatnich aplikacji</string>
@@ -383,7 +383,7 @@
383383
<string name="gesture_handler_open_app_drawer">Otwórz szufladę aplikacji</string>
384384
<string name="gesture_handler_open_app_search">Otwórz wyszukiwarkę aplikacji</string>
385385
<string name="gesture_handler_open_search">Otwórz wyszukiwarkę</string>
386-
<string name="gesture_handler_open_assistant">Open assistant</string>
386+
<string name="gesture_handler_open_assistant">Otwórz asystenta</string>
387387
<string name="pick_app_for_gesture">Wybierz aplikację</string>
388388
<string name="dt2s_admin_hint_title">Wymagane uprawnienia administratora</string>
389389
<string name="dt2s_admin_hint">Aby użyć opcji usypiania przy podwójnym naciśnięciu, ustaw Lawnchair jako aplikację administrującą urządzeniem. Naciśnij \"Otwórz ustawienia\", następnie naciśnij \"Aktywuj tę aplikację do administrowania urządzeniem.\"</string>
@@ -518,8 +518,8 @@
518518
<item quantity="other">%1$d aplikacji</item>
519519
</plurals>
520520
<!-- Folder settings -->
521-
<string name="folder_preview_bg_opacity_label">Przezroczystość tła podglądu ikon</string>
522-
<string name="folder_bg_opacity_label">Przezroczystość tła folderu</string>
521+
<string name="folder_preview_bg_opacity_label">Zakrycie tła podglądu ikon</string>
522+
<string name="folder_bg_opacity_label">Zakrycie tła folderu</string>
523523
<string name="folder_preview_bg_color_label">Kolor tła ikon</string>
524524
<string name="max_folder_columns">Maksymalna liczba kolumn w folderze</string>
525525
<string name="max_folder_rows">Maksymalna liczba wierszy w folderze</string>
@@ -528,7 +528,7 @@
528528
<string name="quickstep_incompatible">Niekompatybilna integracja systemowa</string>
529529
<string name="quickstep_incompatible_description">Twoje urządzenie jest skonfigurowane, żeby używało gestów systemowych (tzw. Quickstep) dostarczonych przez %1$s, ale ta wersja %1$s nie jest zgodna z twoją wersją Androida. Aby móc dalej używać swojego urządzenia, odinstaluj aktualizacje %1$s lub zmień dostawcę gestów systemowych.</string>
530530
<string name="translucent_background">Prześwitujące tło</string>
531-
<string name="translucent_background_alpha">Przezroczystość tła</string>
531+
<string name="translucent_background_alpha">Zakrycie tła</string>
532532
<string name="recents_actions_label">Szybkie akcje</string>
533533
<string name="action_share">Udostępnij</string>
534534
<string name="action_lens">Obiektyw</string>

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,8 @@
518518
<item quantity="other">%1$d приложение</item>
519519
</plurals>
520520
<!-- Folder settings -->
521-
<string name="folder_preview_bg_opacity_label">Предпоказ иконки --> прозрачность фона</string>
521+
<string name="folder_preview_bg_opacity_label">Прозрачность фона во время\n
522+
предпоказа иконки</string>
522523
<string name="folder_bg_opacity_label">Прозрачность фона иконки</string>
523524
<string name="folder_preview_bg_color_label">Цвет фона иконки</string>
524525
<string name="max_folder_columns">Макс. кол-во столбцов в папке</string>

0 commit comments

Comments
 (0)