From f08f357bb3de9ba8ae970aaa8cd779e2755de2eb Mon Sep 17 00:00:00 2001
From: Josia Pietsch <git@jrpie.de>
Date: Sun, 12 Jan 2025 01:31:49 +0100
Subject: [PATCH] add buildFlavor for accrescent

---
 app/build.gradle                              | 23 +++++++++++++++++++
 app/src/accrescent/AndroidManifest.xml        | 15 ++++++++++++
 .../launcher/actions/lock/LockMethod.kt       |  4 +++-
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 app/src/accrescent/AndroidManifest.xml

diff --git a/app/build.gradle b/app/build.gradle
index d4e22e6..28fb941 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,6 +51,29 @@ android {
             versionNameSuffix = "-debug"
         }
     }
+
+    flavorDimensions += "distribution"
+
+    productFlavors {
+        create("default") {
+            dimension = "distribution"
+            getIsDefault().set(true)
+            buildConfigField "boolean", "USE_ACCESSIBILITY_SERVICE", "true"
+        }
+        create("accrescent") {
+            dimension = "distribution"
+            applicationIdSuffix = ".accrescent"
+            versionNameSuffix = "+accrescent"
+            buildConfigField "boolean", "USE_ACCESSIBILITY_SERVICE", "false"
+        }
+    }
+
+    sourceSets {
+        accrescent {
+            manifest.srcFile 'src/accrescent/AndroidManifest.xml'
+        }
+    }
+
     namespace 'de.jrpie.android.launcher'
     buildFeatures {
         buildConfig true
diff --git a/app/src/accrescent/AndroidManifest.xml b/app/src/accrescent/AndroidManifest.xml
new file mode 100644
index 0000000..16ea383
--- /dev/null
+++ b/app/src/accrescent/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:node="merge">
+
+    <application
+        android:name=".Application"
+        tools:node="merge">
+        <service
+            android:name=".actions.lock.LauncherAccessibilityService"
+            tools:strict="true"
+            tools:node="remove" />
+    </application>
+
+</manifest>
diff --git a/app/src/main/java/de/jrpie/android/launcher/actions/lock/LockMethod.kt b/app/src/main/java/de/jrpie/android/launcher/actions/lock/LockMethod.kt
index 5198288..8ae2415 100644
--- a/app/src/main/java/de/jrpie/android/launcher/actions/lock/LockMethod.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/actions/lock/LockMethod.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.os.Build
 import android.widget.Button
 import androidx.appcompat.app.AlertDialog
+import de.jrpie.android.launcher.BuildConfig
 import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 
@@ -36,7 +37,8 @@ enum class LockMethod(
 
     companion object {
         fun chooseMethod(context: Context) {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P ||
+                ! BuildConfig.USE_ACCESSIBILITY_SERVICE) {
                 // only device admin is available
                 setMethod(context, DEVICE_ADMIN)
                 return