Merge remote-tracking branch 'origin/upstream' into trunk

# Conflicts:
#	.github/workflows/ci.yml
#	README.md
#	build.gradle

Author: Goooler

GITHUB_CHANGELOG.md

@@ -58,6 +58,7 @@ Compatibility list:
 * [Lawnchair] Crash when tapping on launcher preview
 * [Launcher] Actually fix app drawer alphabetical listing when loading icon in bulk
 * [Launcher] Mark home bounce as seen when user actually opens All Apps
+* [Launcher] Correct detect QPR1 build and enable features for them accordingly
 
 ### 🥞 Development 4 Release 1 (Snapshot 10)
 

VERIFICATION.md

@@ -1,12 +1,12 @@
 # Lawnchair verification
 
 Lawnchair apk are cryptographically signed and can be verified using two verifications system.
-1. GitHub or SLSA attestations
+1. GitHub or SLSA attestations (Starting with Lawnchair 15 Beta 1)
 2. SHA256 of android app certificate
 
-## SLSA Attestation
+## SLSA Attestation (Starting with Lawnchair 15 Beta 1)
 
-Lawnchair repository is SLSA-Level 2 compliance and can be verified using a provenance.
+Every release of Lawnchair with the exception of Nightly is attested and verified with SLSA provenance. This repository meet the requirements of SLSA-Level 2 compliance
 
 > [!NOTE]
 > It is possible to verify without GitHub CLI by cross-referencing check from 

baseline-profile/build.gradle

@@ -27,18 +27,13 @@ android {
             apiLevel = 36
             systemImageSource = "google"
         }
-        create("pixel6Api33") {
-            device = "Pixel 6"
-            apiLevel = 33
-            systemImageSource = "google"
-        }
     }
 }
 
 // This is the configuration block for the Baseline Profile plugin.
 // You can specify to run the generators on a managed devices or connected devices.
 baselineProfile {
-    managedDevices += ["pixel6Api33", "pixel7Api36"]
+    managedDevices += ["pixel7Api36"]
     useConnectedDevices = false
 }
 

build.gradle

@@ -141,7 +141,7 @@ final def buildCommit = providers.exec {
     commandLine('git', 'rev-parse', '--short=7', 'HEAD')
 }.standardOutput.asText.get().trim()
 
-final def versionString = "15.0.0"
+final def versionString = "16.0.0"
 final def versionDisplayName = "${versionString} (${buildCommit})"
 final def parts = versionString.split("\\.")
 final def majorVersion = parts[0]
@@ -270,7 +270,7 @@ android {
 
             // Lawnchair-TODO: Don't include Compose Disabled, but there's has to be another way of making this NOT long
             java.srcDirs = ['src', 'src_plugins', 'compose/facade/core', 'compose/facade/enabled', 'compose/features']
-            kotlin.srcDirs = ['src', 'src_plugins', 'compose/facade/core', 'compose/facade/enabled', 'compose/features']
+            kotlin.directories.addAll('src', 'src_plugins', 'compose/facade/core', 'compose/facade/enabled', 'compose/features')
 
             manifest.srcFile 'AndroidManifest-common.xml'
             proto {
@@ -280,7 +280,7 @@ android {
 
         lawn {
             java.srcDirs = ['src_flags', 'src_shortcuts_overrides', 'lawnchair/src', 'tests/shared']
-            kotlin.srcDirs = ['src_flags', 'src_shortcuts_overrides', 'lawnchair/src', 'tests/shared']
+            kotlin.directories.addAll('src_flags', 'src_shortcuts_overrides', 'lawnchair/src', 'tests/shared')
             aidl.srcDirs = ['lawnchair/aidl']
             res.srcDirs = ['lawnchair/res', 'platform_frameworks_libs_systemui/animationlib/res']
             manifest.srcFile "lawnchair/AndroidManifest.xml"
@@ -299,7 +299,7 @@ android {
         withQuickstep {
             res.srcDirs = ['quickstep/res', 'quickstep/recents_ui_overrides/res']
             java.srcDirs = ['quickstep/src', 'quickstep/dagger', 'quickstep/recents_ui_overrides/src', 'quickstep/src_protolog']
-            kotlin.srcDirs = ['quickstep/src', 'quickstep/dagger', 'quickstep/recents_ui_overrides/src', 'quickstep/src_protolog']
+            kotlin.directories.addAll('quickstep/src', 'quickstep/dagger', 'quickstep/recents_ui_overrides/src', 'quickstep/src_protolog')
             manifest.srcFile "quickstep/AndroidManifest.xml"
         }
     }

concurrent/build.gradle

@@ -8,7 +8,7 @@ android {
     sourceSets {
         main {
             java.srcDirs = ['src']
-            kotlin.srcDirs = ['src']
+            kotlin.directories.add('src')
         }
     }
 }

docs/assets/version-dark.svg

@@ -7,7 +7,7 @@ android {
     sourceSets {
         main {
             java.srcDirs = ['src']
-            kotlin.srcDirs = ['src']
+            kotlin.directories.add('src')
         }
     }
 }

docs/assets/version-light.svg

@@ -1,6 +1,3 @@
-android.enableHiddenApiCheck=false
-android.hideApiWarning=false
-
 # Improve build performance by enabling R8 parallelism.
 android.r8.maxWorkers=4
 
@@ -11,7 +8,6 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8 -XX:+Use
 org.gradle.parallel=true
 org.gradle.configuration-cache=true
 org.gradle.configuration-cache.parallel=true
-android.experimental.enableParallelR8=true
 
-# Lawnchair-TODO(Cleanup): Remove these flags once Protobuf Gradle Plugin support DSL
+# Lawnchair-TODO(Cleanup): Remove these flags once all configuration and plugins support DSL
 android.newDsl=false

flags/build.gradle

@@ -7,15 +7,15 @@ androidx-room = "2.8.4"
 androidx-lifecycle = "2.10.0"
 accompanist = "0.37.3"
 opto = "1.0.18"
-protobuf = "4.33.4"
+protobuf = "4.33.5"
 retrofit = "3.0.0"
 dagger = "2.59"
 libsu = "6.0.0"
 refine = "4.4.0"
 
 guava = "33.5.0-android"
 junitVersion = "4.13.2"
-mockito = "5.14.2"
+mockito = "5.21.0"
 mockitoKotlin = "5.4.0"
 truth = "1.4.5"
 testRules = "1.7.0"
@@ -34,11 +34,11 @@ google-ksp = "com.google.devtools.ksp:2.3.4"
 google-protobuf = "com.google.protobuf:0.9.6"
 cash-licensee = "app.cash.licensee:1.14.1"
 rikka-refine = { id = "dev.rikka.tools.refine", version.ref = "refine" }
-diffplug-spotless = "com.diffplug.spotless:8.2.0"
+diffplug-spotless = "com.diffplug.spotless:8.2.1"
 
 [libraries]
 # AndroidX
-androidx-activity-compose = "androidx.activity:activity-compose:1.12.2"
+androidx-activity-compose = "androidx.activity:activity-compose:1.12.3"
 androidx-benchmark-macro-junit4 = "androidx.benchmark:benchmark-macro-junit4:1.4.1"
 androidx-concurrent-futures = "androidx.concurrent:concurrent-futures:1.3.0"
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.1"
@@ -53,7 +53,7 @@ androidx-graphics-shapes = "androidx.graphics:graphics-shapes:1.1.0"
 androidx-junit = "androidx.test.ext:junit:1.3.0"
 androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
-androidx-navigation-compose = "androidx.navigation:navigation-compose:2.9.6"
+androidx-navigation-compose = "androidx.navigation:navigation-compose:2.9.7"
 androidx-palette-ktx = "androidx.palette:palette-ktx:1.0.0"
 androidx-preference-ktx = "androidx.preference:preference-ktx:1.2.1"
 androidx-profileinstaller = "androidx.profileinstaller:profileinstaller:1.4.1"
@@ -65,11 +65,11 @@ androidx-uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 androidx-window = "androidx.window:window:1.5.1"
 
 # Compose
-compose-bom = "androidx.compose:compose-bom:2026.01.00"
+compose-bom = "androidx.compose:compose-bom:2026.01.01"
 compose-foundation = { module = "androidx.compose.foundation:foundation" }
 compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" }
 compose-material-icons = "androidx.compose.material:material-icons-extended:1.7.8"
-compose-material3 = "androidx.compose.material3:material3:1.5.0-alpha12"
+compose-material3 = "androidx.compose.material3:material3:1.5.0-alpha13"
 compose-material3-windowSizeClass = { module = "androidx.compose.material3:material3-window-size-class" }
 compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" }
 compose-ui = { module = "androidx.compose.ui:ui" }
@@ -151,8 +151,8 @@ google-truth = { group = "com.google.truth", name = "truth", version.ref = "trut
 junit = { group = "junit", name = "junit", version.ref = "junitVersion" }
 mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockitoKotlin" }
 mockito-robolectric = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
-mockito-robolectric-bytebuddy = "net.bytebuddy:byte-buddy:1.15.11"
-mockito-robolectric-bytebuddy-agent = "net.bytebuddy:byte-buddy-agent:1.15.11"
+mockito-robolectric-bytebuddy = "net.bytebuddy:byte-buddy:1.18.4"
+mockito-robolectric-bytebuddy-agent = "net.bytebuddy:byte-buddy-agent:1.18.4"
 
 [bundles]
 accompanist = ["accompanist-adaptive", "accompanist-drawablepainter", "accompanist-permissions"]