Skip to content

Commit

Permalink
Merge branch 'LawnchairLauncher:14-dev' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
@Goooler
Goooler authored Oct 12, 2024
2 parents e4d1e6c + 79ee73c commit 6624004
Show file tree
Hide file tree
Showing 10 changed files with 165 additions and 161 deletions.
14 changes: 8 additions & 6 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ plugins {
id 'com.android.library' version "8.7.0" apply false
id 'com.android.test' version '8.7.0' apply false
id 'androidx.baselineprofile' version '1.3.2'
id 'org.jetbrains.kotlin.android' version "2.0.20"
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.20"
id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.20"
id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.20"
id "com.google.devtools.ksp" version "2.0.20-1.0.25"
id 'org.jetbrains.kotlin.android' version "2.0.21"
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.21"
id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.21"
id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.21"
id "com.google.devtools.ksp" version "2.0.21-1.0.25"
id 'com.google.protobuf' version "0.9.4"
id 'app.cash.licensee' version "1.11.0"
id 'dev.rikka.tools.refine' version "4.4.0"
Expand Down Expand Up @@ -418,9 +418,11 @@ spotless {
kotlin {
target("lawnchair/src/**/*.kt")
ktlint().customRuleSets([
"io.nlopez.compose.rules:ktlint:0.4.12",
"io.nlopez.compose.rules:ktlint:0.4.15",
]).editorConfigOverride([
"ktlint_compose_compositionlocal-allowlist": "disabled",
"ktlint_compose_lambda-param-event-trailing": "disabled",
"ktlint_compose_content-slot-reused": "disabled",
])
}
}
Expand Down
6 changes: 3 additions & 3 deletions lawnchair/res/values-de-rDE/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<!-- Miscellaneous -->
<string name="what_to_show">Was angezeigt werden soll</string>
<!-- A11y description -->
<string name="accessibility_service_description">To lock your phone when performing a gesture, and to open Recents via 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>
<string name="accessibility_service_description">Um Ihr Telefon bei der Ausführung einer Geste zu sperren und um zuletzt geöffnete Apps per Geste zu öffnen, benötigt Lawnchair Bedienungshilfen-Zugriff.\n\nLawnchair beobachtet keine Benutzeraktionen, obwohl die Berechtigung dies ermöglicht. Lawnchair verwirft alle vom System gesendeten Ereignisse.\n\nUm Ihr Telefon zu sperren oder zuletzt geöffnete Apps zu öffnen, nutzt Lawnchair den performGlobalAction Accessibility Dienst.</string>
<string name="x_by_y">%1$d × %2$d</string>
<string name="x_and_y">%1$s &amp; %2$s</string>
<!--
Expand Down Expand Up @@ -339,7 +339,7 @@
<string name="gesture_back_tap">Zurück-Taste</string>
<string name="gesture_handler_no_op">Nichts tun</string>
<string name="gesture_handler_sleep">Ruhezustand</string>
<string name="gesture_handler_recents">Open Recents</string>
<string name="gesture_handler_recents">Öffne zuletzt genutzte Apps</string>
<string name="gesture_handler_open_notifications">Benachrichtigungsleiste öffnen</string>
<string name="gesture_handler_open_app_option">App öffnen</string>
<string name="gesture_handler_open_app_config">%1$s öffnen</string>
Expand All @@ -353,7 +353,7 @@
<string name="d2ts_recents_a11y_hint_title">Bedienungshilfen aktivieren</string>
<string name="dt2s_a11y_hint">Um Doppeltippen zum Display ausschalten zu verwenden, aktiviere die Bedienungshilfen. Tippe auf \"Einstellungen öffnen\", wähle \"Lawnchair\" aus und aktiviere \"Lawnchair verwenden\"\"\n\nLawnchair verwendet die Bedienungshilfe \'performGlobalAction\', um diese Aktion auszuführen. Dies ist eine sensible Berechtigung, die es ermöglicht, andere Apps zu überwachen. Lawnchair ist jedoch nicht für derartige Funktionen konfiguriert und liest keine Vorgänge aus.</string>
<string name="dt2s_recents_warning_open_settings">Einstellungen öffnen</string>
<string name="recents_a11y_hint">To use Open Recents, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"\n\nLawnchair uses Accessibility\'s `performGlobalAction` method to perform this action. This is a sensitive permission that allows monitoring other apps. However, Lawnchair is not configured for that functionality and receives no events.</string>
<string name="recents_a11y_hint">Um zuletzt geöffnete Apps zu öffnen, aktivieren Sie den Lawnchair Bedienungshilfen Dienst. Tippen Sie auf „Einstellungen“ öffnen, wählen Sie „Lawnchair“ und aktivieren Sie „Lawnchair verwenden“.\n\nLawnchair verwendet die „performGlobalAction“ Funktion des Bedienungshilfe Dienstes um diese Aktion durchzuführen. Dies ist eine sensible Berechtigung, die die Überwachung anderer Apps erlaubt. Lawnchair ist jedoch nicht für diese Funktionalität konfiguriert und erhält keine Ereignisse.</string>
<!--
Bug reporting
Expand Down
40 changes: 20 additions & 20 deletions lawnchair/res/values-hi-rIN/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,27 @@
-->
<string name="preview_label">प्रीव्यू</string>
<string name="action_create">बनाएँ</string>
<string name="action_backup">Backup</string>
<string name="action_backup">बैकअप</string>
<string name="action_restore">पुनर्स्थापित करें</string>
<string name="action_delete">नष्ट करे</string>
<string name="action_reset">रीसेट</string>
<string name="action_unlock">Unlock</string>
<string name="action_lock">Lock</string>
<string name="action_unlock">अनलॉक</string>
<string name="action_lock">लॉक</string>
<string name="action_apply">ओके</string>
<string name="action_customize">अपने अनुरूप सेट करें</string>
<string name="always_choice">Always</string>
<string name="never_choice">Never</string>
<string name="always_choice">हमेशा</string>
<string name="never_choice">कभी नहीं</string>
<string name="clipboard">क्लिपबोर्ड</string>
<string name="action_copy_link">Copy link</string>
<string name="action_copy_link">लिंक की प्रतिलिपि करें</string>
<string name="action_copy">कॉपी</string>
<string name="action_paste">पेस्ट</string>
<string name="loading">हो रहा है...</string>
<string name="managed_by_lawnchair">Lawnchair द्वारा प्रबंधित</string>
<!-- When mentioning settings UI -->
<string name="smartspace_preferences">पसंद</string>
<string name="settings_button_text">Home settings</string>
<string name="system_settings">System settings</string>
<string name="title_change_settings">Change settings</string>
<string name="settings_button_text">होम सेटिंग्स</string>
<string name="system_settings">सिस्टम सेटिंग्स</string>
<string name="title_change_settings">सेटिंग्स परिवर्तित करना</string>
<!--
General "words" used throughout Lawnchair
Expand All @@ -64,29 +64,29 @@
<string name="layout">लेआउट</string>
<!-- Generic styling options -->
<string name="wallpaper">वॉलपेपर</string>
<string name="background_opacity">Background opacity</string>
<string name="background_opacity">पृष्ठभूमि अपारदर्शिता</string>
<!-- Toast text and tips -->
<string name="copied_toast">Copied to clipboard</string>
<string name="item_removed">Item removed</string>
<string name="copied_toast">क्लिपबोर्ड पर कॉपी किया गया</string>
<string name="item_removed">आइटम हटाया गया</string>
<!-- Miscellaneous -->
<string name="what_to_show">What to show</string>
<string name="what_to_show">क्या दिखाएं?</string>
<!-- A11y description -->
<string name="accessibility_service_description">To lock your phone when performing a gesture, and to open Recents via 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>
<string name="accessibility_service_description">जेस्चर करते समय अपने फ़ोन को लॉक करने के लिए, और जेस्चर के ज़रिए हाल ही में खोलने के लिए, लॉनचेयर को एक्सेसिबिलिटी एक्सेस की आवश्यकता होती है।\n\nलॉनचेयर किसी भी उपयोगकर्ता की कार्रवाई को नहीं देखता है, हालाँकि ऐसा करने का विशेषाधिकार सभी एक्सेसिबिलिटी सेवाओं के लिए आवश्यक है। लॉनचेयर सिस्टम द्वारा भेजे गए किसी भी ईवेंट को त्याग देता है।\n\n लॉनचेयर आपके फ़ोन को लॉक करने या हाल ही में खोलने के लिए परफ़ॉर्मग्लोबलएक्शन एक्सेसिबिलिटी सेवा का उपयोग करता है।</string>
<string name="x_by_y">%1$d x %2$d</string>
<string name="x_and_y">%1$s &amp; %2$s</string>
<string name="x_and_y">%1$s और %2$s</string>
<!--
Preference Dashboard
-->
<string name="settings">सेटिंग्स</string>
<string name="general_label">सामान्य</string>
<string name="general_description">Colors, icon packs, notification dots</string>
<string name="home_screen_label">Home screen</string>
<string name="home_screen_description">Feed, grid, icons</string>
<string name="general_description">रंग, आइकन पैक, अधिसूचना बिंदु</string>
<string name="home_screen_label">होम स्क्रीन</string>
<string name="home_screen_description">फ़ीड, ग्रिड, चिह्न</string>
<string name="dock_label">गोदी</string>
<string name="dock_description">Search bar, icon count</string>
<string name="app_drawer_label">App drawer</string>
<string name="dock_description">खोज बार, आइकन गिनती</string>
<string name="app_drawer_label">अनुप्रयोग का दराज</string>
<string name="app_drawer_description">Hidden apps, column count, icons</string>
<string name="drawer_search_label">Drawer search</string>
<string name="drawer_search_description">Web suggestions, global search</string>
Expand Down
38 changes: 19 additions & 19 deletions lawnchair/res/values-in-rID/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
<string name="layout">Tata Letak</string>
<!-- Generic styling options -->
<string name="wallpaper">Wallpaper</string>
<string name="background_opacity">Transparansi latar belakang</string>
<string name="background_opacity">Tingkat transparan latar belakang</string>
<!-- Toast text and tips -->
<string name="copied_toast">Disalin ke papan klip</string>
<string name="item_removed">Item dihapus</string>
<string name="item_removed">Butir dihapus</string>
<!-- Miscellaneous -->
<string name="what_to_show">Yang ditampilkan</string>
<!-- A11y description -->
Expand All @@ -81,42 +81,42 @@
-->
<string name="settings">Pengaturan</string>
<string name="general_label">Umum</string>
<string name="general_description">Warna, paket ikon, titik notifikasi</string>
<string name="general_description">Warna, paket icon, titik notifikasi</string>
<string name="home_screen_label">Layar beranda</string>
<string name="home_screen_description">Umpan, kisi, ikon</string>
<string name="home_screen_description">Umpan, kisi, lambang</string>
<string name="dock_label">Bilah</string>
<string name="dock_description">Bilah pencarian, jumlah ikon</string>
<string name="app_drawer_label">Laci apli</string>
<string name="app_drawer_description">Apli tersembunyi, jumlah kolom, ikon</string>
<string name="dock_description">Bilah pencarian, jumlah lambang</string>
<string name="app_drawer_label">Laci aplikasi</string>
<string name="app_drawer_description">Aplikasi tersembunyi, jumlah kolom, lambang</string>
<string name="drawer_search_label">Pencarian laci</string>
<string name="drawer_search_description">Saran web, pencarian global</string>
<string name="drawer_search_description">Saran jaring, pencarian global</string>
<string name="folders_label">Folder</string>
<string name="folders_description">Jumlah baris dan kolom</string>
<string name="gestures_label">Isyarat</string>
<string name="gestures_description">Ketukan dan usapan</string>
<string name="quickstep_label">Terbaru</string>
<string name="quickstep_description">Tombol Hapus Semua, radius sudut</string>
<string name="about_label">Tentang</string>
<string name="app_info_drop_target_label">Info apli</string>
<string name="app_info_drop_target_label">Info aplikasi</string>
<string name="debug_restart_launcher">Muat ulang Lawnchair</string>
<string name="experimental_features_label">Fitur eksperimental</string>
<string name="experimental_features_label">Masa datang eksperimental</string>
<!-- Experimental features -->
<string name="font_picker_label">Kustomisasi font</string>
<string name="font_picker_label">Perubahan huruf</string>
<string name="font_picker_description">Beberapa teks tetap tidak berubah</string>
<string name="smartspace_calendar_label">Kostumisasi kalender Sekilas</string>
<string name="smartspace_calendar_description">Memungkinkan menampilkan tanggal dalam sistem kalender non-Gregorian</string>
<string name="smartspace_calendar_label">Perubahan kalender Sekilas</string>
<string name="smartspace_calendar_description">Memungkinkan menampilkan tanggal dalam sistem kalender bukan masehi</string>
<string name="workspace_increase_max_grid_size_label">Tingkatkan batas ukuran kisi</string>
<string name="workspace_increase_max_grid_size_description">Tingkatkan batas ukuran kisi yang diperbolehkan dari 10 x 10 ke 20 x 20</string>
<string name="always_reload_icons_label">Selalu muat ulang ikon</string>
<string name="always_reload_icons_description">Hindari menggunakan ikon yang telah di cache dari paket ikon</string>
<string name="workspace_increase_max_grid_size_description">Tingkatkan batas ukuran kisi yang diperbolehkan dari 10x10 ke 20x20</string>
<string name="always_reload_icons_label">Selalu muat ulang lambang</string>
<string name="always_reload_icons_description">Hindari menggunakan ikon yang telah di tembolok dari paket lambang</string>
<string name="recents_lock_unlock">Kunci/buka kunci</string>
<string name="recents_lock_unlock_description">Cegah apli terpilih untuk ditutup saat menekan \"Bersihkan semua\"</string>
<string name="recents_lock_unlock_description">Cegah aplikasi terpilih untuk ditutup saat menekan \"Bersihkan semua\"</string>
<!--
Notifications
-->
<string name="set_default_launcher_tip">Untuk mengakses pintasan dan fitur tambahan, atur Lawnchair sebagai peluncur default Anda</string>
<string name="set_default_launcher_tip">Untuk mengakses pintasan dan kelebihan tambahan, atur Lawnchair sebagai peluncur bawaan Anda</string>
<string name="notification_dots">Titik notifikasi</string>
<string name="show_notification_count">Tampilkan jumlah notifikasi</string>
<string name="notification_dots_color">Warna titik notifikasi</string>
Expand All @@ -133,7 +133,7 @@
<!-- General strings -->
<string name="icon_style_label">Gaya ikon</string>
<string name="icon_shape_label">Bentuk ikon</string>
<string name="icon_sizes">Ukuran ikon</string>
<string name="icon_sizes">Ukuran lambang</string>
<string name="show_labels">Tampilkan label</string>
<string name="label_size">Ukuran label</string>
<string name="twoline_label">Gunakan beberapa baris</string>
Expand Down
Loading

0 comments on commit 6624004

Please sign in to comment.