Merge branch 'LawnchairLauncher:14-dev' into trunk

Goooler · Jun 20, 2024 · 071ffac · 071ffac
2 parents d8117d9 + aaa00c1
commit 071ffac
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 29 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ allprojects {
         apply plugin: 'org.gradle.android.cache-fix'
 
         android {
-            compileSdk 34
+            compileSdk 35
             defaultConfig {
                 minSdk 26
                 targetSdk 34
@@ -382,7 +382,7 @@ dependencies {
     implementation "androidx.room:room-ktx:$roomVersion"
     ksp "androidx.room:room-compiler:$roomVersion"
 
-    implementation "com.github.topjohnwu.libsu:service:5.2.2"
+    implementation "com.github.topjohnwu.libsu:service:5.3.0"
 
     // Persian Date
     implementation 'com.github.samanzamani:PersianDate:1.7.1'
@@ -421,8 +421,6 @@ licensee {
     allow("Apache-2.0")
     allow("BSD-3-Clause")
     allow("GPL-2.0-or-later")
-    allowDependency("com.github.topjohnwu.libsu", "core", "5.2.2")
-    allowDependency("com.github.topjohnwu.libsu", "service", "5.2.2")
     allowUrl("https://github.com/patrykmichalik/opto/blob/master/LICENSE")
     allowUrl("https://github.com/RikkaApps/HiddenApiRefinePlugin/blob/main/LICENSE")
     allowUrl("https://opensource.org/licenses/mit-license.php")

diff --git a/lawnchair/res/values-cs-rCZ/strings.xml b/lawnchair/res/values-cs-rCZ/strings.xml
@@ -433,15 +433,15 @@
     <string name="system_settings">Systémová nastavení</string>
     <string name="action_unlock">Odemknout</string>
     <string name="action_lock">Uzamknout</string>
-    <string name="allapps_twoline_label">Use Multiple Lines</string>
-    <string name="hidden_apps_show_always">Always</string>
-    <string name="hidden_apps_show_name_typed">If Full Name is Typed</string>
-    <string name="hidden_apps_show_never">Never</string>
-    <string name="show_hidden_apps_in_search_results">Show Hidden Apps in Search Results</string>
+    <string name="allapps_twoline_label">Použít několik řádků</string>
+    <string name="hidden_apps_show_always">Vždy</string>
+    <string name="hidden_apps_show_name_typed">Pokud je celý název zadán</string>
+    <string name="hidden_apps_show_never">Nikdy</string>
+    <string name="show_hidden_apps_in_search_results">Zobrazit skryté aplikace ve vyhledávání</string>
     <string name="search_algorithm_app_search">Hledání aplikací</string>
-    <string name="search_algorithm_global_search_on_device">Global Search (on-device)</string>
-    <string name="search_algorithm_global_search_via_asi">Global Search (via ASI)</string>
-    <string name="app_search_algorithm">Search Algorithm</string>
-    <string name="all_apps_search_result_calculator">Calculator</string>
-    <string name="accessibility_service_description">To lock 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, Lawnchair uses the performGlobalAction Accessibility service.</string>
+    <string name="search_algorithm_global_search_on_device">Globální vyhledávání (v zařízení)</string>
+    <string name="search_algorithm_global_search_via_asi">Globální vyhledávání (prostřednictvím ASI)</string>
+    <string name="app_search_algorithm">Algoritmus Hledání</string>
+    <string name="all_apps_search_result_calculator">Kalkulačka</string>
+    <string name="accessibility_service_description">K uzamčení telefonu při provádění gesta vyžaduje Lawnchair přístup k usnadnění.\n\nLawnchair nesleduje žádnou akci uživatele, ačkoli oprávnění k tomu je vyžadováno pro všechny služby usnadnění. Lawnchair zahodí jakoukoli událost odeslanou systémem.\n\nAby byl váš telefon uzamčen, používá Lawnchair službu usnadnění performGlobalAction.</string>
 </resources>
diff --git a/lawnchair/res/values-in-rID/strings.xml b/lawnchair/res/values-in-rID/strings.xml
@@ -430,15 +430,15 @@
     <string name="system_settings">Pengaturan Sistem</string>
     <string name="action_unlock">Buka kunci</string>
     <string name="action_lock">Kunci</string>
-    <string name="allapps_twoline_label">Use Multiple Lines</string>
-    <string name="hidden_apps_show_always">Always</string>
+    <string name="allapps_twoline_label"></string>
+    <string name="hidden_apps_show_always"></string>
     <string name="hidden_apps_show_name_typed">If Full Name is Typed</string>
-    <string name="hidden_apps_show_never">Never</string>
-    <string name="show_hidden_apps_in_search_results">Show Hidden Apps in Search Results</string>
+    <string name="hidden_apps_show_never"></string>
+    <string name="show_hidden_apps_in_search_results">Tampilkan aplikasi tersembunyi di hasil penelusuran</string>
     <string name="search_algorithm_app_search">Pencarian Aplikasi</string>
-    <string name="search_algorithm_global_search_on_device">Global Search (on-device)</string>
-    <string name="search_algorithm_global_search_via_asi">Global Search (via ASI)</string>
-    <string name="app_search_algorithm">Search Algorithm</string>
-    <string name="all_apps_search_result_calculator">Calculator</string>
-    <string name="accessibility_service_description">To lock 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, Lawnchair uses the performGlobalAction Accessibility service.</string>
+    <string name="search_algorithm_global_search_on_device">Pencarian Global</string>
+    <string name="search_algorithm_global_search_via_asi">Pencarian Global (Via ASI)</string>
+    <string name="app_search_algorithm">Algoritma Pencarian</string>
+    <string name="all_apps_search_result_calculator">Kalkulator</string>
+    <string name="accessibility_service_description">Untuk mengunci ponsel Anda saat melakukan gerakan, Lawnchair memerlukan akses aksesibilitas.\n\nLawnchair tidak menonton tindakan pengguna apa pun, meskipun hak istimewa untuk melakukannya diperlukan untuk semua layanan aksesibilitas. Lawnchair membuang acara apa pun yang dikirim oleh sistem.\n\nUntuk mengunci ponsel Anda, Lawnchair menggunakan layanan performGlobalAction Accessibility.</string>
 </resources>
diff --git a/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt b/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt
@@ -68,7 +68,7 @@ class SleepMethodRoot(context: Context) : SleepGestureHandler.SleepMethod(contex
     override suspend fun isSupported() = Shell.getShell().isRoot
 
     override suspend fun sleep(launcher: LawnchairLauncher) {
-        Shell.su("input keyevent 26").exec()
+        Shell.cmd("input keyevent 26").exec()
     }
 }
 

diff --git a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
@@ -97,7 +97,7 @@ public static void saveScreenshot(SystemUiProxy systemUiProxy, Bitmap screenshot
                 systemUiProxy.handleImageBundleAsScreenshot(BitmapUtil.hardwareBitmapToBundle(screenshot),
                         screenshotBounds, visibleInsets, task);
             } catch (Throwable ee) {
-                Shell.su("input keyevent 120").exec();
+                Shell.cmd("input keyevent 120").exec();
             }
         }
     }

diff --git a/settings.gradle b/settings.gradle
@@ -2,8 +2,9 @@ pluginManagement {
     repositories {
         google {
             content {
-                includeGroupByRegex(".*google.*")
-                includeGroupByRegex(".*android.*")
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
             }
         }
         gradlePluginPortal()
@@ -32,8 +33,9 @@ dependencyResolutionManagement {
     repositories {
         google {
             content {
-                includeGroupByRegex(".*google.*")
-                includeGroupByRegex(".*android.*")
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
             }
         }
         mavenCentral()