Skip to content

Commit 3e3e82a

Browse files
Merge branch 'LawnchairLauncher:14-dev' into 14-dev
2 parents dbdca82 + dcc0470 commit 3e3e82a

File tree

84 files changed

+126
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+126
-143
lines changed

build.gradle

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,11 @@ allprojects {
3737
}
3838
dependencies {
3939
implementation 'androidx.core:core-ktx:1.13.1'
40-
implementation 'androidx.appcompat:appcompat:1.7.0'
4140
}
4241
}
4342

4443
plugins.withId('com.google.protobuf') {
45-
def protocVersion = '4.28.0'
44+
def protocVersion = '4.28.1'
4645
protobuf {
4746
// Configure the protoc executable
4847
protoc {
@@ -294,6 +293,11 @@ androidComponents {
294293
}
295294
}
296295

296+
composeCompiler {
297+
stabilityConfigurationFile = layout.projectDirectory.file("compose_compiler_config.conf")
298+
reportsDestination = layout.buildDirectory.dir("compose_build_reports")
299+
}
300+
297301
addFrameworkJar('framework-14.jar')
298302

299303
dependencies {
@@ -336,7 +340,6 @@ dependencies {
336340

337341
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1'
338342
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.2'
339-
implementation "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"
340343
implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
341344
implementation 'dev.rikka.tools.refine:runtime:4.4.0'
342345

@@ -389,7 +392,7 @@ dependencies {
389392
implementation 'com.airbnb.android:lottie:6.5.2'
390393

391394
// Compose drag and drop library
392-
implementation 'sh.calvin.reorderable:reorderable:2.3.2'
395+
implementation 'sh.calvin.reorderable:reorderable:2.3.3'
393396

394397
// Smartspacer
395398
implementation('com.kieronquinn.smartspacer:sdk-client:1.0.11') {

compose_compiler_config.conf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
androidx.collection.*
2+
3+
java.nio.file.Path
4+
5+
kotlin.collections.*
6+
kotlin.time.Duration
7+
8+
kotlinx.coroutines.CoroutineScope

lawnchair/res/values-af-rZA/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<!-- A11y description -->
7474
<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>
7575
<string name="x_by_y">%1$d x %2$d</string>
76-
<string name="x_and_y">%s &amp; %s</string>
76+
<string name="x_and_y">%1$s &amp; %2$s</string>
7777
<!--
7878
7979
Preference Dashboard

lawnchair/res/values-am-rET/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<!-- A11y description -->
7474
<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>
7575
<string name="x_by_y">%1$d x %2$d</string>
76-
<string name="x_and_y">%s &amp; %s</string>
76+
<string name="x_and_y">%1$s &amp; %2$s</string>
7777
<!--
7878
7979
Preference Dashboard

lawnchair/res/values-ar-rSA/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<!-- A11y description -->
7474
<string name="accessibility_service_description">لقفل هاتفك عند تنفيذ إيماءة، يتطلب Lawnchair الوصول إلى إمكانية الوصول.\n\nLawnchair لا يراقب أي إجراء للمستخدم، رغم أن الصلاحية للقيام بذلك مطلوبة لجميع خدمات إمكانية الوصول. يقوم Lawnchair بالتخلص من أي حدث يتم إرساله بواسطة النظام.\n\nلقفل هاتفك، يستخدم Lawnchair خدمة إمكانية الوصول لتنفيذ الإجراء العالمي.</string>
7575
<string name="x_by_y">18. %1$d x %2$d</string>
76-
<string name="x_and_y">19. %s &amp; %s</string>
76+
<string name="x_and_y">19. %1$s &amp; %2$s</string>
7777
<!--
7878
7979
Preference Dashboard

lawnchair/res/values-az-rAZ/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<!-- A11y description -->
7474
<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>
7575
<string name="x_by_y">%1$d x %2$d</string>
76-
<string name="x_and_y">%s &amp; %s</string>
76+
<string name="x_and_y">%1$s &amp; %2$s</string>
7777
<!--
7878
7979
Preference Dashboard

lawnchair/res/values-b+sr+Latn/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<!-- A11y description -->
7474
<string name="accessibility_service_description">Da biste zaključali uređaj pokretom potrebno je da dodelite Lawnchairu pristup usluzi pristupačnosti.\n\nLawnchair ne nadgleda korisničke radnje, ali je privilegija za to potrebna svim uslugama pristupačnosti. Lawnchair odbacuje sve događaje koje pošalje sistem.\n\nKako bi zaključao uređaj, Lawnchair koristi uslugu pristupačnosti performGlobalAction.</string>
7575
<string name="x_by_y">%1$d x %2$d</string>
76-
<string name="x_and_y">%s i %s</string>
76+
<string name="x_and_y">%1$s i %2$s</string>
7777
<!--
7878
7979
Preference Dashboard

lawnchair/res/values-bn-rBD/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<!-- A11y description -->
7474
<string name="accessibility_service_description">জেসচারের মাধ্যমে ফোন লক করার জন্য Lawnchair এর এক্সেসিবিলিটি এক্সেস প্রয়োজন।\n\nLawnchair ব্যবহারকারীদের কর্মকান্ডে কোন নজরদারি করে না, যদিও এক্সেসিবিলিটি সার্ভিসের জন্য এই ক্ষমতা প্রয়োজন। সিস্টেম কর্তৃক পাঠানো যেকোন কিছু Lawnchair সংরক্ষণ করবে না।\n\nLawnchair ফোন লক করার জন্য performGlobalAction এক্সেসিবিলিটি সার্ভিস ব্যবহার করে।</string>
7575
<string name="x_by_y">%1$d x %2$d</string>
76-
<string name="x_and_y">%s &amp; %s</string>
76+
<string name="x_and_y">%1$s &amp; %2$s</string>
7777
<!--
7878
7979
Preference Dashboard

lawnchair/res/values-bs-rBA/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<!-- A11y description -->
7474
<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>
7575
<string name="x_by_y">%1$d x %2$d</string>
76-
<string name="x_and_y">%s &amp; %s</string>
76+
<string name="x_and_y">%1$s &amp; %2$s</string>
7777
<!--
7878
7979
Preference Dashboard

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<!-- A11y description -->
7474
<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>
7575
<string name="x_by_y">%1$d x %2$d</string>
76-
<string name="x_and_y">%s &amp; %s</string>
76+
<string name="x_and_y">%1$s &amp; %2$s</string>
7777
<!--
7878
7979
Preference Dashboard

0 commit comments

Comments
 (0)