Squashed commit of the following

commit eb7932c Author: Goooler <wangzongler@gmail.com> Date: Wed May 15 21:36:03 2024 +0800 Migrate ModalBottomSheet commit 061fa5a Merge: 7a3f16f f48b5bf Author: Goooler <wangzongler@gmail.com> Date: Wed May 15 21:34:12 2024 +0800 Merge branch 'refs/heads/14-dev' into renovate/androidx.compose.material3-material3-window-size-class-1.x commit 7a3f16f Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed May 15 04:26:58 2024 +0800 Update dependency androidx.compose.material3:material3 to v1.3.0-beta01 commit f48b5bf Author: Zongle Wang <wangzongler@gmail.com> Date: Wed May 15 15:40:30 2024 +0800 Use collectAsStateWithLifecycle to safely collect uiState (LawnchairLauncher#4385) https://medium.com/androiddevelopers/consuming-flows-safely-in-jetpack-compose-cde014d0d5a3 commit 000f58c Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed May 15 09:11:46 2024 +0800 Update androidx.lifecycle to v2.8.0 (LawnchairLauncher#4390) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit d00e0dd Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Tue May 14 20:27:03 2024 +0000 Update dependency androidx.compose.material3:material3-window-size-class to v1.3.0-beta01 commit 0003c47 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Tue May 14 14:02:36 2024 +0800 Update plugin com.google.devtools.ksp to v2.0.0-RC3-1.0.20 (LawnchairLauncher#4386) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit bf612c3 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon May 13 21:05:15 2024 +0800 Update dependency io.nlopez.compose.rules:ktlint to v0.3.21 (LawnchairLauncher#4381) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 845aa47 Author: Lawnchair Bot <115872683+lawnchair-bot@users.noreply.github.com> Date: Sun May 12 03:51:20 2024 +0330 New Crowdin translations by GitHub Action (LawnchairLauncher#4378) Co-authored-by: Crowdin Bot <support+bot@crowdin.com> commit ae58d9e Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat May 11 09:06:44 2024 +0800 Update plugin com.gradle.develocity to v3.17.3 (LawnchairLauncher#4373) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 617ebbd Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat May 11 09:06:34 2024 +0800 Update Kotlin, KSP and Compose Compiler (LawnchairLauncher#4374) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Squashed commit of the following: commit 95c19d9 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed May 15 03:35:52 2024 +0300 fix(deps): update protocversion to v4.27.0-rc3 (#81) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 68aec57 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed May 15 03:26:15 2024 +0300 chore(deps): update plugin com.android.library to v8.6.0-alpha01 (#79) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: NoName <29282888+xteamlyer@users.noreply.github.com> commit 4bc534b Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed May 15 03:25:40 2024 +0300 chore(deps): update plugin com.android.application to v8.6.0-alpha01 (#78) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 8fe7cea Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed May 15 03:25:30 2024 +0300 fix(deps): update roomversion to v2.7.0-alpha02 (#77) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 557cad0 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed May 15 03:25:21 2024 +0300 fix(deps): update dependency androidx.navigation:navigation-compose to v2.8.0-beta01 (#76) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: NoName <29282888+xteamlyer@users.noreply.github.com> commit da7f4fc Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed May 15 03:24:45 2024 +0300 fix(deps): update dependency androidx.lifecycle:lifecycle-viewmodel-compose to v2.8.0 (#75) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit d055007 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed May 15 03:24:35 2024 +0300 fix(deps): update dependency androidx.lifecycle:lifecycle-common to v2.8.0 (#74) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: NoName <29282888+xteamlyer@users.noreply.github.com> commit f1b30a1 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed May 15 03:24:03 2024 +0300 fix(deps): update dependency androidx.concurrent:concurrent-futures to v1.2.0-beta01 (#73) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit a2bac9f Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed May 15 03:23:52 2024 +0300 fix(deps): update dependency androidx.benchmark:benchmark-macro-junit4 to v1.3.0-alpha05 (#70) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 58527db Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed May 15 03:23:43 2024 +0300 fix(deps): update dependency androidx.appcompat:appcompat to v1.7.0-rc01 (#69) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit fb5ff33 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed May 15 03:23:34 2024 +0300 chore(deps): update plugin androidx.baselineprofile to v1.3.0-alpha05 (#68) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 129609f Author: NoName <29282888+xteamlyer@users.noreply.github.com> Date: Tue May 14 15:22:03 2024 +0300 Squashed commit of the following: commit 38df057 Author: Goooler <wangzongler@gmail.com> Date: Tue May 14 09:29:26 2024 +0800 Use collectAsStateWithLifecycle to safely collect uiState https://medium.com/androiddevelopers/consuming-flows-safely-in-jetpack-compose-cde014d0d5a3 commit bf612c3 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon May 13 21:05:15 2024 +0800 Update dependency io.nlopez.compose.rules:ktlint to v0.3.21 (LawnchairLauncher#4381) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 845aa47 Author: Lawnchair Bot <115872683+lawnchair-bot@users.noreply.github.com> Date: Sun May 12 03:51:20 2024 +0330 New Crowdin translations by GitHub Action (LawnchairLauncher#4378) Co-authored-by: Crowdin Bot <support+bot@crowdin.com> commit ae58d9e Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat May 11 09:06:44 2024 +0800 Update plugin com.gradle.develocity to v3.17.3 (LawnchairLauncher#4373) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 617ebbd Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat May 11 09:06:34 2024 +0800 Update Kotlin, KSP and Compose Compiler (LawnchairLauncher#4374) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit bc8bcb9 Author: NoName <29282888+xteamlyer@users.noreply.github.com> Date: Tue May 14 15:21:40 2024 +0300 Squashed commit of the following: commit 0003c47 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Tue May 14 14:02:36 2024 +0800 Update plugin com.google.devtools.ksp to v2.0.0-RC3-1.0.20 (LawnchairLauncher#4386) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit bf612c3 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon May 13 21:05:15 2024 +0800 Update dependency io.nlopez.compose.rules:ktlint to v0.3.21 (LawnchairLauncher#4381) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 845aa47 Author: Lawnchair Bot <115872683+lawnchair-bot@users.noreply.github.com> Date: Sun May 12 03:51:20 2024 +0330 New Crowdin translations by GitHub Action (LawnchairLauncher#4378) Co-authored-by: Crowdin Bot <support+bot@crowdin.com> commit ae58d9e Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat May 11 09:06:44 2024 +0800 Update plugin com.gradle.develocity to v3.17.3 (LawnchairLauncher#4373) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 617ebbd Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat May 11 09:06:34 2024 +0800 Update Kotlin, KSP and Compose Compiler (LawnchairLauncher#4374) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit df144f4 Author: NoName <29282888+xteamlyer@users.noreply.github.com> Date: Mon May 13 17:16:33 2024 +0300 Squashed commit of the following: commit bf612c3 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Mon May 13 21:05:15 2024 +0800 Update dependency io.nlopez.compose.rules:ktlint to v0.3.21 (LawnchairLauncher#4381) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 845aa47 Author: Lawnchair Bot <115872683+lawnchair-bot@users.noreply.github.com> Date: Sun May 12 03:51:20 2024 +0330 New Crowdin translations by GitHub Action (LawnchairLauncher#4378) Co-authored-by: Crowdin Bot <support+bot@crowdin.com> commit ae58d9e Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat May 11 09:06:44 2024 +0800 Update plugin com.gradle.develocity to v3.17.3 (LawnchairLauncher#4373) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 617ebbd Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat May 11 09:06:34 2024 +0800 Update Kotlin, KSP and Compose Compiler (LawnchairLauncher#4374) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit 2d3004a Author: NoName <29282888+xteamlyer@users.noreply.github.com> Date: Sat May 11 15:36:42 2024 +0300 chore: some changes
xteamlyer · May 15, 2024 · d5f548c · d5f548c
1 parent 87df68d
commit d5f548c
Show file tree

Hide file tree

Showing 27 changed files with 159 additions and 218 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,65 +2,29 @@ name: CI
 
 on:
   push:
-    branches:
-      - trunk
-    paths-ignore:
-      - '.idea/**'
-      - '.gitattributes'
-      - '.github/**.json'
-      - '.gitignore'
-      - '**.md'
-      - 'LICENSE'
-      - 'NOTICE'
-  pull_request:
-    branches:
-      - trunk
-    paths-ignore:
-      - '.idea/**'
-      - '.gitattributes'
-      - '.github/**.json'
-      - '.gitignore'
-      - '**.md'
-      - 'LICENSE'
-      - 'NOTICE'
+  workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
         with:
           submodules: true
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
         with:
-          distribution: 'zulu'
+          distribution: "zulu"
           java-version: 21
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3
         with:
           cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
           gradle-home-cache-cleanup: true
-      - run: ./gradlew assembleLawnWithQuickstepRelease
-      - uses: actions/upload-artifact@v4
-        if: github.ref == 'refs/heads/trunk' && github.event_name == 'push'
+      - run: ./gradlew clean assembleLawnWithQuickstepRelease
+      - name: Rename APK
+        run: mv build/outputs/apk/lawnWithQuickstep/release/Lawnchair*.apk build/outputs/apk/lawnWithQuickstep/release/Lawnchairr.apk
+      - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
         with:
-          name: Release APK
-          path: |
-            build/outputs/apk/lawnWithQuickstep/release/*.apk
-            build/outputs/mapping/lawnWithQuickstepRelease/mapping.txt
-
-  check-style:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: 21
-      - uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
-      - run: ./gradlew spotlessCheck
+          name: Lawnchair
+          path: build/outputs/apk/lawnWithQuickstep/release/*.apk
diff --git a/baseline-profile/build.gradle b/baseline-profile/build.gradle
@@ -40,8 +40,8 @@ baselineProfile {
 }
 
 dependencies {
-    implementation 'androidx.test.ext:junit:1.1.5'
-    implementation 'androidx.test.espresso:espresso-core:3.5.1'
+    implementation 'androidx.test.ext:junit:1.2.0-alpha04'
+    implementation 'androidx.test.espresso:espresso-core:3.6.0-alpha04'
     implementation 'androidx.test.uiautomator:uiautomator:2.3.0'
-    implementation 'androidx.benchmark:benchmark-macro-junit4:1.2.4'
+    implementation 'androidx.benchmark:benchmark-macro-junit4:1.3.0-alpha05'
 }
diff --git a/build.gradle b/build.gradle
@@ -3,15 +3,15 @@ import com.android.build.gradle.api.AndroidBasePlugin
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id 'com.android.application' version "8.4.0"
-    id 'com.android.library' version "8.4.0" apply false
-    id 'com.android.test' version '8.4.0' apply false
-    id 'androidx.baselineprofile' version '1.2.4'
-    id 'org.jetbrains.kotlin.android' version "2.0.0-RC2"
-    id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0-RC2"
-    id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.0-RC2"
-    id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.0-RC2"
-    id "com.google.devtools.ksp" version "2.0.0-RC2-1.0.20"
+    id 'com.android.application' version "8.6.0-alpha01"
+    id 'com.android.library' version "8.6.0-alpha01" apply false
+    id 'com.android.test' version '8.6.0-alpha01' apply false
+    id 'androidx.baselineprofile' version '1.3.0-alpha05'
+    id 'org.jetbrains.kotlin.android' version "2.0.0-RC3"
+    id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0-RC3"
+    id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.0-RC3"
+    id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.0-RC3"
+    id "com.google.devtools.ksp" version "2.0.0-RC3-1.0.20"
     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"
@@ -36,13 +36,13 @@ allprojects {
             }
         }
         dependencies {
-            implementation 'androidx.core:core-ktx:1.13.1'
-            implementation 'androidx.appcompat:appcompat:1.6.1'
+            implementation 'androidx.core:core-ktx:1.14.0-alpha01'
+            implementation 'androidx.appcompat:appcompat:1.7.0-rc01'
         }
     }
 
     plugins.withId('com.google.protobuf') {
-        def protocVersion = '4.26.1'
+        def protocVersion = '4.27.0-RC3'
         protobuf {
             // Configure the protoc executable
             protoc {
@@ -131,7 +131,9 @@ final def quickstepMaxSdk = "34"
 android {
     namespace "com.android.launcher3"
     defaultConfig {
-        versionCode versionInt
+        // Lawnchair Launcher 14.0 Beta 2
+        // Android 14, Minor 0, Lawnchair Stage 2 (Beta), Update No 2
+        versionCode 14_00_02_02
         versionName "${versionDisplayName}"
         buildConfigField "String", "VERSION_DISPLAY_NAME", "\"${versionDisplayName}\""
         buildConfigField "String", "MAJOR_VERSION", "\"${majorVersion}\""
@@ -326,14 +328,14 @@ dependencies {
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
-    implementation 'androidx.profileinstaller:profileinstaller:1.3.1'
+    implementation 'androidx.profileinstaller:profileinstaller:1.4.0-alpha01'
     baselineProfile projects.baselineProfile
 
-    implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
-    implementation "androidx.recyclerview:recyclerview:1.3.2"
+    implementation "androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03"
+    implementation "androidx.recyclerview:recyclerview:1.4.0-alpha01"
     implementation "androidx.preference:preference-ktx:1.2.1"
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3'
     implementation "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
     implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
@@ -342,26 +344,26 @@ dependencies {
     implementation platform("androidx.compose:compose-bom:2024.05.00")
     implementation "androidx.compose.ui:ui"
     implementation "androidx.compose.ui:ui-util"
-    debugImplementation "androidx.compose.ui:ui-tooling"
+    implementation "androidx.compose.ui:ui-tooling"
     implementation "androidx.compose.ui:ui-tooling-preview"
     implementation "androidx.compose.ui:ui-text-google-fonts"
     implementation "androidx.compose.foundation:foundation"
     implementation "androidx.compose.material:material-icons-extended"
     implementation "androidx.compose.material:material"
     implementation "androidx.compose.runtime:runtime-livedata"
-    implementation 'androidx.compose.material3:material3:1.3.0-alpha05'
-    implementation 'androidx.compose.material3:material3-window-size-class:1.3.0-alpha05'
-    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
+    implementation 'androidx.compose.material3:material3:1.3.0-beta01'
+    implementation 'androidx.compose.material3:material3-window-size-class:1.3.0-beta01'
+    implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha13"
     implementation "androidx.activity:activity-compose:1.9.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
-    implementation "androidx.navigation:navigation-compose:2.7.7"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.0"
+    implementation "androidx.navigation:navigation-compose:2.8.0-beta01"
     implementation "androidx.palette:palette-ktx:1.0.0"
     implementation "androidx.slice:slice-core:1.1.0-alpha02"
-    def accompanistVersion = '0.34.0'
+    def accompanistVersion = '0.35.0-alpha'
     implementation "com.google.accompanist:accompanist-adaptive:$accompanistVersion"
     implementation "com.google.accompanist:accompanist-drawablepainter:$accompanistVersion"
     implementation "com.google.accompanist:accompanist-permissions:$accompanistVersion"
-    implementation "com.google.android.material:material:1.12.0"
+    implementation "com.google.android.material:material:1.13.0-alpha02"
     implementation "io.github.fornewid:material-motion-compose-core:1.2.0"
     implementation 'dev.kdrag0n:colorkt:1.0.5'
     implementation 'io.coil-kt:coil-compose:2.6.0'
@@ -375,7 +377,7 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
     implementation "com.squareup.retrofit2:converter-kotlinx-serialization:$retrofitVersion"
 
-    def roomVersion = '2.6.1'
+    def roomVersion = '2.7.0-alpha02'
     implementation "androidx.room:room-runtime:$roomVersion"
     implementation "androidx.room:room-ktx:$roomVersion"
     ksp "androidx.room:room-compiler:$roomVersion"
@@ -408,7 +410,7 @@ spotless {
     kotlin {
         target("lawnchair/src/**/*.kt")
         ktlint().customRuleSets([
-            "io.nlopez.compose.rules:ktlint:0.3.20",
+            "io.nlopez.compose.rules:ktlint:0.3.21",
         ]).editorConfigOverride([
             "ktlint_compose_compositionlocal-allowlist": "disabled",
         ])

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionSha256Sum=a2e1cfee7ffdeee86015b85b2dd2a435032c40eedc01d8172285556c7d8fea13
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

diff --git a/lawnchair/res/values-ru-rRU/strings.xml b/lawnchair/res/values-ru-rRU/strings.xml
@@ -64,8 +64,8 @@
     <string name="fontWorkspace">Общие</string>
     <string name="fontHeading">Заголовки</string>
     <string name="fontHeadingMedium">Заголовки (средние)</string>
-    <string name="fontBody">Body</string>
-    <string name="fontBodyMedium">Body (Medium)</string>
+    <string name="fontBody">Обычный</string>
+    <string name="fontBodyMedium">Обычный (Средний)</string>
     <string name="icon_style">Стиль значка</string>
     <string name="transparent_background_icons">Прозрачные тематические иконки</string>
     <string name="transparent_background_icons_description">Использовать прозрачный фон на тематических значках</string>
@@ -189,7 +189,7 @@
     <string name="home_screen_locked">Домашний экран заблокирован</string>
     <string name="show_dot_pagination_label">Использовать точечную нумерацию страниц</string>
     <string name="show_dot_pagination_description">Use dots instead of lines to show page number</string>
-    <string name="show_material_u_popup_label">Use New Popup Style</string>
+    <string name="show_material_u_popup_label">Использовать новый стиль всплывающего окна</string>
     <string name="show_material_u_popup_description">Использовать современный стиль всплывающих окон Material You</string>
     <string name="popup_menu">Всплывающее меню</string>
     <string name="home_screen_lock_toggle_from_home_popup">Показать кнопку блокировки</string>
@@ -240,7 +240,7 @@
     <string name="smartspace_calendar_persian">Персидский</string>
     <string name="smartspace_preferences">Настройки</string>
     <string name="smartspace_widget_toggle_label">Показать на домашнем экране</string>
-    <string name="smartspace_widget_toggle_description">At a Glance can be manually added to the home screen by placing the “Lawnchair” widget</string>
+    <string name="smartspace_widget_toggle_description">Виджет At a Glance можно добавить, поместив виджет \"Lawnchair\".</string>
     <string name="smartspace_mode_label">Провайдер \"At a Glance\"</string>
     <string name="smartspace_mode_google">Google</string>
     <string name="smartspace_mode_google_search">Поиск Google</string>
@@ -262,23 +262,23 @@
     <string name="search_provider_sponsored_description">%1$s &amp; Lawnchair имеет соглашение о разделе доходов.\n\nПоиск с помощью %1$s помогает поддерживать Lawnchair.</string>
     <string name="app_label">Приложение</string>
     <string name="website_label">Веб-сайт</string>
-    <string name="qsb_search_provider_app_required">App required</string>
+    <string name="qsb_search_provider_app_required">Требуется приложение</string>
     <!-- AppDrawerPrefences -->
     <string name="background_opacity">Прозрачность фона</string>
     <string name="hidden_apps_label">Скрытые приложения</string>
     <string name="show_enable_smart_hide">Показать, когда название введено полностью</string>
     <string name="hide_hidden_apps_search">Скрывать в результатах поиска</string>
     <string name="pref_all_apps_bulk_icon_loading_title">Массовая загрузка приложений</string>
-    <string name="pref_all_apps_bulk_icon_loading_description">Load and display all icons at once instead of individually loading and displaying icons. Can fix issues with search but will increase loading time.</string>
+    <string name="pref_all_apps_bulk_icon_loading_description">Загружать и отображать все иконки за один раз вместо загрузки и отображения каждой иконки по отдельности. Может исправить ошибки с поиском, но увеличивает время загрузки.</string>
     <string name="pref_all_apps_remember_position_title">Помнить позицию</string>
-    <string name="pref_all_apps_remember_position_description">Remember app drawer position after leaving drawer</string>
+    <string name="pref_all_apps_remember_position_description">Запомнить позицию поля поиска приложений после закрытия поиска</string>
     <string name="pref_all_apps_show_scrollbar_title">Отображать полосу прокрутки</string>
     <string name="pref_category_search">Поиск</string>
     <string name="show_app_search_bar">Показать строку поиска</string>
     <string name="pref_search_auto_show_keyboard">Автоматически выдвигать клавиатуру</string>
     <string name="fuzzy_search_title">Поиск по сходству</string>
     <string name="fuzzy_search_desc">Поиск приложений по похожему запросу.</string>
-    <string name="clear_history">Clear Search History</string>
+    <string name="clear_history">Очистить историю поиска</string>
     <string name="app_drawer_columns">Количество столбцов в меню приложений</string>
     <string name="row_height_label">Высота строки</string>
     <string name="app_drawer_indent_label">Горизонтальный отступ</string>
@@ -434,13 +434,13 @@
     <string name="action_unlock">Разблокировать</string>
     <string name="action_lock">Заблокировать</string>
     <string name="allapps_twoline_label">Bir nechta qatordan foydalanish</string>
-    <string name="hidden_apps_show_always">Always</string>
+    <string name="hidden_apps_show_always">Всегда</string>
     <string name="hidden_apps_show_name_typed">Agar to\'liq ism yozilsa</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">Показывать скрытые приложения в результатах поиска</string>
     <string name="search_algorithm_app_search">Поиск приложений</string>
     <string name="search_algorithm_global_search_on_device">Global qidiruv (qurilmada)</string>
-    <string name="search_algorithm_global_search_via_asi">Global Search (via ASI)</string>
-    <string name="app_search_algorithm">Search Algorithm</string>
+    <string name="search_algorithm_global_search_via_asi">Глобальный поиск (с помощью ASI)</string>
+    <string name="app_search_algorithm">Алгоритм поиска</string>
     <string name="all_apps_search_result_calculator">Kalkulyator</string>
 </resources>
diff --git a/lawnchair/res/values-th-rTH/strings.xml b/lawnchair/res/values-th-rTH/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Todo: find common strings and centralize them here. Should we make all strings specific though?  -->
     <!-- PreferenceDashboard -->
-    <string name="set_default_launcher_tip">ตั้งค่า Lawnchair ให้เป็น Lancher เริ่มต้นเพื่อเข้าถึงทางลัดและอีกมากมาย</string>
+    <string name="set_default_launcher_tip">ตั้งค่า Lawnchair ให้เป็น Launcher เริ่มต้นเพื่อเข้าถึงทางลัดและอีกมากมาย</string>
     <string name="settings">การตั้งค่า</string>
     <string name="general_label">ทั่วไป</string>
     <string name="general_description">สี, ชุดไอคอน, จุดแจ้งเตือน</string>