From c776a2c524fdf24a7c185eb0bcaaa114c6893fbf Mon Sep 17 00:00:00 2001
From: Yasan <y.ghafarian@dariahamrah.ir>
Date: Mon, 12 Aug 2024 12:36:09 +0200
Subject: [PATCH] Introduce a build configuration without accessibility
 services (#4625)

* Create `accessibility` flavor dimension

* Only use accessibility sleep method on withAccessibility builds

* Move LawnchairAccessibilityService manifest declaration to withAccessibility

* Revert "Create `accessibility` flavor dimension"

This reverts commit 1c180aa630d5133b71b36f3041a3b05e5a4d255e.

* Use `github` instead of the new `withAccessibility` flavor

* Move manifest into channel/github

* Update quickstep/AndroidManifest-launcher.xml

---------

Co-authored-by: Goooler <wangzongler@gmail.com>
Co-authored-by: John Andrew Camu <werdna.jac@gmail.com>
---
 build.gradle                                  |  8 +++++++
 channel/github/AndroidManifest.xml            | 22 +++++++++++++++++++
 lawnchair/AndroidManifest.xml                 | 13 -----------
 .../gestures/handlers/SleepGestureHandler.kt  | 13 ++++++-----
 4 files changed, 38 insertions(+), 18 deletions(-)
 create mode 100644 channel/github/AndroidManifest.xml

diff --git a/build.gradle b/build.gradle
index 6851a59b2f..68f263d383 100644
--- a/build.gradle
+++ b/build.gradle
@@ -285,6 +285,14 @@ android {
             }
         }
 
+        github {
+            manifest.srcFile "channel/github/AndroidManifest.xml"
+        }
+
+        market {
+            manifest.srcFile "channel/market/AndroidManifest.xml"
+        }
+
         lawnWithQuickstepGithub {
             manifest.srcFile "quickstep/AndroidManifest-launcher.xml"
         }
diff --git a/channel/github/AndroidManifest.xml b/channel/github/AndroidManifest.xml
new file mode 100644
index 0000000000..4c8763546c
--- /dev/null
+++ b/channel/github/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application tools:ignore="MissingApplicationIcon">
+
+        <service
+            android:name="app.lawnchair.LawnchairAccessibilityService"
+            android:exported="false"
+            android:label="@string/derived_app_name"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+            <intent-filter>
+                <action android:name="android.accessibilityservice.AccessibilityService" />
+            </intent-filter>
+            <meta-data
+                android:name="android.accessibilityservice"
+                android:resource="@xml/accessibility_service_config" />
+        </service>
+
+    </application>
+
+</manifest>
diff --git a/lawnchair/AndroidManifest.xml b/lawnchair/AndroidManifest.xml
index 5d56727bb4..a93e689cbe 100644
--- a/lawnchair/AndroidManifest.xml
+++ b/lawnchair/AndroidManifest.xml
@@ -93,19 +93,6 @@
             </intent-filter>
         </receiver>
 
-        <service
-            android:name="app.lawnchair.LawnchairAccessibilityService"
-            android:exported="false"
-            android:label="@string/derived_app_name"
-            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
-            <intent-filter>
-                <action android:name="android.accessibilityservice.AccessibilityService" />
-            </intent-filter>
-            <meta-data
-                android:name="android.accessibilityservice"
-                android:resource="@xml/accessibility_service_config" />
-        </service>
-
         <provider
             android:name="app.lawnchair.bugreport.FileProvider"
             android:authorities="${applicationId}.fileprovider"
diff --git a/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt b/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt
index ceef8fe8ff..413fc83c9e 100644
--- a/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt
+++ b/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt
@@ -41,6 +41,7 @@ import app.lawnchair.lawnchairApp
 import app.lawnchair.ui.ModalBottomSheetContent
 import app.lawnchair.util.requireSystemService
 import app.lawnchair.views.ComposeBottomSheet
+import com.android.launcher3.BuildConfig
 import com.android.launcher3.R
 import com.android.launcher3.Utilities
 import com.topjohnwu.superuser.Shell
@@ -51,11 +52,13 @@ class SleepGestureHandler(context: Context) : GestureHandler(context) {
         methods.first { it.isSupported() }.sleep(launcher)
     }
 
-    private val methods = listOf(
-        SleepMethodRoot(context),
-        SleepMethodPieAccessibility(context),
-        SleepMethodDeviceAdmin(context),
-    )
+    private val methods = buildList {
+        add(SleepMethodRoot(context))
+        if (BuildConfig.FLAVOR_channel == "github") {
+            add(SleepMethodPieAccessibility(context))
+        }
+        add(SleepMethodDeviceAdmin(context))
+    }
 
     sealed class SleepMethod(protected val context: Context) {
         abstract suspend fun isSupported(): Boolean