From 20f7a1f71fb7b58de6a32b56f7b85826b675a280 Mon Sep 17 00:00:00 2001
From: Yasan Ghaffarian <yasan.ghaffarian@kiwi.com>
Date: Tue, 13 Aug 2024 20:27:47 +0200
Subject: [PATCH] Revert "Introduce a build configuration without accessibility
 services (#4625)"

This reverts commit c776a2c524fdf24a7c185eb0bcaaa114c6893fbf.
---
 build.gradle                                  |  8 -------
 channel/github/AndroidManifest.xml            | 22 -------------------
 lawnchair/AndroidManifest.xml                 | 13 +++++++++++
 .../gestures/handlers/SleepGestureHandler.kt  | 13 +++++------
 4 files changed, 18 insertions(+), 38 deletions(-)
 delete mode 100644 channel/github/AndroidManifest.xml

diff --git a/build.gradle b/build.gradle
index 68f263d3836..6851a59b2f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -285,14 +285,6 @@ 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
deleted file mode 100644
index 4c8763546c7..00000000000
--- a/channel/github/AndroidManifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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 a93e689cbe8..5d56727bb4b 100644
--- a/lawnchair/AndroidManifest.xml
+++ b/lawnchair/AndroidManifest.xml
@@ -93,6 +93,19 @@
             </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 413fc83c9e5..ceef8fe8ff4 100644
--- a/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt
+++ b/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt
@@ -41,7 +41,6 @@ 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
@@ -52,13 +51,11 @@ class SleepGestureHandler(context: Context) : GestureHandler(context) {
         methods.first { it.isSupported() }.sleep(launcher)
     }
 
-    private val methods = buildList {
-        add(SleepMethodRoot(context))
-        if (BuildConfig.FLAVOR_channel == "github") {
-            add(SleepMethodPieAccessibility(context))
-        }
-        add(SleepMethodDeviceAdmin(context))
-    }
+    private val methods = listOf(
+        SleepMethodRoot(context),
+        SleepMethodPieAccessibility(context),
+        SleepMethodDeviceAdmin(context),
+    )
 
     sealed class SleepMethod(protected val context: Context) {
         abstract suspend fun isSupported(): Boolean