From e5f25683c3dd5e7cfe44cd31d0286ecd183deb69 Mon Sep 17 00:00:00 2001 From: Suphon Thanakornpakapong Date: Sun, 8 May 2022 23:20:37 +0700 Subject: [PATCH] Change quickstep compatibility meta --- build.gradle | 8 ++++++++ lawnchair/AndroidManifest.xml | 4 ++-- lawnchair/src/app/lawnchair/LawnchairApp.kt | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4fb50254d1..0d39ba2214 100644 --- a/build.gradle +++ b/build.gradle @@ -100,6 +100,9 @@ def releaseName = "Alpha 5" def versionDisplayName = "${version} ${isReleaseBuild ? releaseName : devReleaseName}" def majorVersion = versionDisplayName.split("\\.")[0] +def quickstepMinSdk = "32" +def quickstepMaxSdk = "32" + android { compileSdkVersion COMPILE_SDK buildToolsVersion BUILD_TOOLS_VERSION @@ -118,6 +121,11 @@ android { buildConfigField "String", "COMMIT_HASH", "\"${buildCommit}\"" buildConfigField "boolean", "ENABLE_AUTO_INSTALLS_LAYOUT", "false" + manifestPlaceholders.quickstepMinSdk = quickstepMinSdk + manifestPlaceholders.quickstepMaxSdk = quickstepMaxSdk + buildConfigField "int", "QUICKSTEP_MIN_SDK", quickstepMinSdk + buildConfigField "int", "QUICKSTEP_MAX_SDK", quickstepMaxSdk + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } diff --git a/lawnchair/AndroidManifest.xml b/lawnchair/AndroidManifest.xml index bd5543da46..f45a3b080a 100644 --- a/lawnchair/AndroidManifest.xml +++ b/lawnchair/AndroidManifest.xml @@ -102,10 +102,10 @@ + android:value="${quickstepMinSdk}" /> + android:value="${quickstepMaxSdk}" /> diff --git a/lawnchair/src/app/lawnchair/LawnchairApp.kt b/lawnchair/src/app/lawnchair/LawnchairApp.kt index 474c3259e9..4ab0bca9c6 100644 --- a/lawnchair/src/app/lawnchair/LawnchairApp.kt +++ b/lawnchair/src/app/lawnchair/LawnchairApp.kt @@ -27,6 +27,7 @@ import android.provider.Settings import android.util.Log import app.lawnchair.preferences.PreferenceManager import app.lawnchair.util.restartLauncher +import com.android.launcher3.BuildConfig import com.android.launcher3.InvariantDeviceProfile import com.android.quickstep.RecentsActivity import com.android.systemui.shared.system.QuickStepContract @@ -118,7 +119,7 @@ class LawnchairApp : Application() { } private fun checkRecentsComponent(): Boolean { - if (Build.VERSION.SDK_INT !in Build.VERSION_CODES.R..Build.VERSION_CODES.S) { + if (Build.VERSION.SDK_INT !in BuildConfig.QUICKSTEP_MIN_SDK..BuildConfig.QUICKSTEP_MAX_SDK) { Log.d(TAG, "API ${Build.VERSION.SDK_INT} unsupported, disabling recents") return false }