🔮 Merge repository updated to latest snapshot!

Script Execution UTC Time: null

.github/FUNDING.yml

@@ -0,0 +1 @@
+open_collective: lawnchair

.github/workflows/ci.yml

@@ -38,10 +38,9 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: 21
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
         with:
           cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
-          gradle-home-cache-cleanup: true
       - name: Write sign info
         if: github.repository_owner == 'LawnchairLauncher'
         run: |
@@ -70,9 +69,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: 21
-      - uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+      - uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew spotlessCheck
 
   send-notifications:

.github/workflows/release_update.yml

@@ -31,9 +31,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: 21
-      - uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+      - uses: gradle/actions/setup-gradle@v4
       - name: Write sign info
         id: sign-release-apk
         if: github.repository_owner == 'LawnchairLauncher'
@@ -71,7 +69,7 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.event.inputs.tagName }}
-          prerelease: ${{ github.events.inputs.prerelease }}
+          prerelease: ${{ github.event.inputs.prerelease }}
           draft: true
           body_path: ${{ github.workspace }}/GITHUB_CHANGELOG.md
           files: artifacts/release-apk/${{ github.event.inputs.artifactName }}

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.1'
+    implementation 'androidx.test.espresso:espresso-core:3.6.1'
     implementation 'androidx.test.uiautomator:uiautomator:2.3.0'
     implementation 'androidx.benchmark:benchmark-macro-junit4:1.2.4'
 }

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.5.0"
-    id 'com.android.library' version "8.5.0" apply false
-    id 'com.android.test' version '8.5.0' apply false
+    id 'com.android.application' version "8.5.2"
+    id 'com.android.library' version "8.5.2" apply false
+    id 'com.android.test' version '8.5.2' apply false
     id 'androidx.baselineprofile' version '1.2.4'
-    id 'org.jetbrains.kotlin.android' version "2.0.0"
-    id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0"
-    id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.0"
-    id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.0"
-    id "com.google.devtools.ksp" version "2.0.0-1.0.22"
+    id 'org.jetbrains.kotlin.android' version "2.0.10"
+    id 'org.jetbrains.kotlin.plugin.compose' version "2.0.10"
+    id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.10"
+    id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.10"
+    id "com.google.devtools.ksp" version "2.0.10-1.0.24"
     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"
@@ -42,7 +42,7 @@ allprojects {
     }
 
     plugins.withId('com.google.protobuf') {
-        def protocVersion = '4.27.1'
+        def protocVersion = '4.27.3'
         protobuf {
             // Configure the protoc executable
             protoc {
@@ -78,7 +78,7 @@ allprojects {
 
     ext {
         FRAMEWORK_PREBUILTS_DIR = "$rootDir/prebuilts/libs"
-        daggerVersion = '2.51.1'
+        daggerVersion = '2.52'
 
         addFrameworkJar = { String name ->
             def frameworkJar = new File(FRAMEWORK_PREBUILTS_DIR, name)
@@ -164,7 +164,6 @@ android {
     buildFeatures {
         aidl true
         buildConfig true
-        compose true
         resValues true
     }
 
@@ -360,7 +359,7 @@ dependencies {
     implementation "androidx.preference:preference-ktx:1.2.1"
 
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1'
     implementation "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
     implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
     implementation 'dev.rikka.tools.refine:runtime:4.4.0'
@@ -375,12 +374,12 @@ dependencies {
     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-beta03'
-    implementation 'androidx.compose.material3:material3-window-size-class:1.3.0-beta03'
+    implementation 'androidx.compose.material3:material3:1.3.0-beta05'
+    implementation 'androidx.compose.material3:material3-window-size-class:1.3.0-beta05'
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
-    implementation "androidx.activity:activity-compose:1.9.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2"
-    implementation "androidx.navigation:navigation-compose:2.8.0-beta03"
+    implementation "androidx.activity:activity-compose:1.9.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4"
+    implementation "androidx.navigation:navigation-compose:2.8.0-beta07"
     implementation "androidx.palette:palette-ktx:1.0.0"
     implementation "androidx.slice:slice-core:1.1.0-alpha02"
     def accompanistVersion = '0.34.0'
@@ -390,7 +389,7 @@ dependencies {
     implementation "com.google.android.material:material:1.12.0"
     implementation "io.github.fornewid:material-motion-compose-core:1.2.1"
     implementation 'dev.kdrag0n:colorkt:1.0.5'
-    implementation 'io.coil-kt:coil-compose:2.6.0'
+    implementation 'io.coil-kt:coil-compose:2.7.0'
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     def optoVersion = "1.0.18"
     implementation "com.patrykmichalik.opto:domain:$optoVersion"
@@ -406,17 +405,22 @@ dependencies {
     implementation "androidx.room:room-ktx:$roomVersion"
     ksp "androidx.room:room-compiler:$roomVersion"
 
-    implementation "com.github.topjohnwu.libsu:service:5.3.0"
+    implementation "com.github.topjohnwu.libsu:service:6.0.0"
 
     // Persian Date
     implementation 'com.github.samanzamani:PersianDate:1.7.1'
 
-    implementation 'com.airbnb.android:lottie:6.4.1'
+    implementation 'com.airbnb.android:lottie:6.5.0'
+
+    // Compose drag and drop library
+    implementation 'sh.calvin.reorderable:reorderable:2.3.0'
 
     // Smartspacer
-    implementation('com.kieronquinn.smartspacer:sdk-client:1.0.10') {
+    implementation('com.kieronquinn.smartspacer:sdk-client:1.0.11') {
         exclude group: "com.github.skydoves", module: "balloon"
     }
+
+    implementation("com.github.android:renderscript-intrinsics-replacement-toolkit:b6363490c3")
 }
 
 ksp {
@@ -434,7 +438,7 @@ spotless {
     kotlin {
         target("lawnchair/src/**/*.kt")
         ktlint().customRuleSets([
-            "io.nlopez.compose.rules:ktlint:0.4.4",
+            "io.nlopez.compose.rules:ktlint:0.4.10",
         ]).editorConfigOverride([
             "ktlint_compose_compositionlocal-allowlist": "disabled",
         ])
@@ -445,6 +449,8 @@ licensee {
     allow("Apache-2.0")
     allow("BSD-3-Clause")
     allow("GPL-2.0-or-later")
+    allowDependency("com.github.topjohnwu.libsu", "core", "6.0.0")
+    allowDependency("com.github.topjohnwu.libsu", "service", "6.0.0")
     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")

compatLib/compatLibVS/src/main/java/app/lawnchair/compatlib/twelve/QuickstepCompatFactoryVS.java

@@ -30,11 +30,7 @@ public ActivityOptionsCompat getActivityOptionsCompat() {
     @NonNull
     @Override
     public RemoteTransitionCompat getRemoteTransitionCompat() {
-        try {
-            return this::createRemoteTransition;
-        } catch (Throwable t) {
-            return super.getRemoteTransitionCompat();
-        }
+        return this::createRemoteTransition;
     }
 
     // TODO remove this as it causing glitches on first launch opening/closing app
@@ -51,7 +47,8 @@ private RemoteTransition createRemoteTransition(
                 | InstantiationException
                 | InvocationTargetException
                 | NoSuchMethodException e) {
-            throw new RuntimeException("Error creating RemoteTransitionCompat" + debugName, e);
+            return super.getRemoteTransitionCompat()
+                    .getRemoteTransition(remoteTransition, appThread, debugName);
         }
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

lawnchair/AndroidManifest.xml

@@ -25,6 +25,7 @@
     <uses-permission android:name="com.google.android.apps.nexuslauncher.permission.QSB" />
     <uses-permission android:name="com.kieronquinn.app.smartspacer.permission.ACCESS_SMARTSPACER"/>
     <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_HISTORY_BOOKMARKS" />
     <uses-permission android:name="android.permission.WRITE_HISTORY_BOOKMARKS" />

lawnchair/res/drawable-ru/ic_yandex.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#fc3f1d"
+        android:pathData="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M13.6 6.8h-1.1c-2.05 0-3.1 1.05-3.1 2.55 0 1.7 0.75 2.5 2.25 3.55l1.25 0.85-3.6 5.4H6.6l3.25-4.8C8 13 6.95 11.7 6.95 9.55c0-2.75 1.9-4.6 5.55-4.6h3.6V19.2h-2.5V6.8z" />
+</vector>

lawnchair/res/drawable-ru/ic_yandex_tinted.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M9.953,0.176C12.32,-0.238 14.809,0.082 16.996,1.086C19.59,2.258 21.734,4.395 22.91,6.992C24.082,9.512 24.309,12.445 23.59,15.125C22.797,18.129 20.777,20.781 18.094,22.348C15.391,23.957 12.039,24.414 9,23.621C6.207,22.914 3.695,21.156 2.082,18.766C0.352,16.254 -0.344,13.059 0.16,10.055C0.523,7.785 1.563,5.633 3.109,3.938C4.883,1.965 7.34,0.617 9.953,0.176ZM10.379,2.172C7.035,2.695 4.07,5.063 2.797,8.191C1.813,10.516 1.777,13.215 2.699,15.566C3.688,18.16 5.813,20.305 8.414,21.289C10.645,22.176 13.203,22.188 15.449,21.344C18.035,20.398 20.188,18.332 21.215,15.777C22.012,13.879 22.172,11.727 21.699,9.727C21.172,7.469 19.832,5.402 17.961,4.027C15.832,2.414 13.016,1.703 10.379,2.172ZM8.727,6.754C9.828,5.637 11.457,5.313 12.969,5.273C14.184,5.277 15.398,5.293 16.609,5.262C16.617,9.746 16.609,14.23 16.613,18.715C15.828,18.719 15.043,18.715 14.254,18.719C14.254,14.832 14.258,10.945 14.254,7.059C13.094,7.078 11.773,6.906 10.809,7.699C9.828,8.445 9.875,9.887 10.266,10.934C10.844,12.297 12.324,12.84 13.402,13.723C12.238,15.367 11.141,17.059 9.996,18.723C9.098,18.711 8.199,18.715 7.301,18.715C8.367,17.203 9.449,15.699 10.52,14.188C9.438,13.406 8.293,12.52 7.871,11.195C7.418,9.703 7.605,7.914 8.727,6.754ZM8.727,6.754" />
+</vector>

lawnchair/res/drawable/ic_yandex.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#fc3f1d"
+        android:pathData="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12.35 13.35c0.75 1.6 0.95 2.15 0.95 4.1V20h-2.6v-4.3L5.8 5h2.7l3.85 8.35zM15.55 5l-3.2 7.25H15L18.2 5h-2.65z" />
+</vector>

lawnchair/res/drawable/ic_yandex_tinted.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M9.957,0.199C12.32,-0.215 14.805,0.105 16.984,1.105C19.578,2.277 21.715,4.41 22.891,7C24.059,9.516 24.285,12.445 23.57,15.117C22.777,18.117 20.762,20.766 18.082,22.324C15.383,23.934 12.039,24.387 9.004,23.598C6.219,22.891 3.711,21.137 2.102,18.754C0.375,16.246 -0.32,13.055 0.184,10.055C0.547,7.793 1.582,5.645 3.129,3.953C4.895,1.984 7.348,0.641 9.957,0.199ZM14.613,12.809L17.434,6.402L15.09,6.402L12.27,12.809ZM13.109,19.656L13.109,17.406C13.109,15.707 12.898,15.211 12.25,13.801L8.855,6.402L6.453,6.402L10.801,15.859L10.801,19.656ZM10.383,2.191C7.047,2.711 4.086,5.074 2.816,8.199C1.836,10.52 1.797,13.215 2.719,15.559C3.703,18.148 5.824,20.289 8.418,21.27C10.648,22.156 13.203,22.168 15.445,21.324C18.023,20.383 20.172,18.316 21.199,15.77C21.992,13.875 22.152,11.727 21.684,9.73C21.152,7.477 19.816,5.414 17.949,4.043C15.824,2.434 13.016,1.723 10.383,2.191ZM10.383,2.191" />
+</vector>

lawnchair/res/layout/search_container_all_apps.xml

@@ -16,6 +16,7 @@
 
 <app.lawnchair.allapps.AllAppsSearchInput xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/search_container_all_apps"
     android:layout_width="match_parent"
     android:layout_height="@dimen/search_box_container_height"
@@ -73,21 +74,53 @@
         android:layout_height="@dimen/search_box_height"
         android:layout_gravity="bottom|center|start"
         android:background="@drawable/pill_ripple"
+        android:layout_marginEnd="6dp"
         android:clickable="true"
         android:contentDescription="@string/search_bar_label"
         android:scaleType="center"
         android:src="@drawable/ic_allapps_search"
         app:tint="?android:textColorSecondary" />
 
-    <ImageButton
-        android:id="@+id/action_btn"
-        android:layout_width="@dimen/search_box_height"
+    <LinearLayout
+        android:layout_width="wrap_content"
         android:layout_height="@dimen/search_box_height"
-        android:layout_gravity="bottom|center|end"
-        android:background="@drawable/pill_ripple"
-        android:clickable="true"
-        android:contentDescription="@string/search_input_action_clear_results"
-        android:scaleType="center"
-        android:src="@drawable/ic_remove_no_shadow"
-        app:tint="?android:textColorSecondary" />
+        android:layout_gravity="bottom|end|center"
+        android:clipToPadding="false"
+        android:orientation="horizontal"
+        tools:ignore="RtlSymmetry">
+
+        <app.lawnchair.qsb.AssistantIconView
+            android:id="@+id/mic_btn"
+            android:layout_width="@dimen/search_box_height"
+            android:layout_height="@dimen/search_box_height"
+            android:background="@drawable/pill_ripple"
+            android:clickable="true"
+            android:contentDescription="@string/label_voice_search"
+            android:scaleType="center"
+            android:src="@drawable/ic_remove_no_shadow"
+            app:tint="?android:textColorSecondary" />
+
+        <ImageButton
+            android:id="@+id/lens_btn"
+            android:layout_width="@dimen/search_box_height"
+            android:layout_height="@dimen/search_box_height"
+            android:background="@drawable/pill_ripple"
+            android:clickable="true"
+            android:contentDescription="@string/label_lens"
+            android:scaleType="center"
+            android:src="@drawable/ic_remove_no_shadow"
+            app:tint="?android:textColorSecondary" />
+
+        <ImageButton
+            android:id="@+id/action_btn"
+            android:layout_width="@dimen/search_box_height"
+            android:layout_height="@dimen/search_box_height"
+            android:background="@drawable/pill_ripple"
+            android:clickable="true"
+            android:contentDescription="@string/search_input_action_clear_results"
+            android:scaleType="center"
+            android:src="@drawable/ic_remove_no_shadow"
+            app:tint="?android:textColorSecondary" />
+    </LinearLayout>
+
 </app.lawnchair.allapps.AllAppsSearchInput>