Merge 3fbe750f6f into b4608ef153

app/src/main/AndroidManifest.xml

@@ -85,7 +85,7 @@
         <service
             android:name=".actions.lock.LauncherAccessibilityService"
             android:exported="true"
-            android:label="@string/accessibility_service_name"
+            android:label="@string/app_name"
             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
             <intent-filter>
                 <action android:name="android.accessibilityservice.AccessibilityService" />
@@ -97,4 +97,4 @@
         </service>
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/de/jrpie/android/launcher/actions/LauncherAction.kt

@@ -11,7 +11,9 @@ import android.view.KeyEvent
 import android.widget.Toast
 import androidx.appcompat.content.res.AppCompatResources
 import de.jrpie.android.launcher.Application
+import de.jrpie.android.launcher.BuildConfig
 import de.jrpie.android.launcher.R
+import de.jrpie.android.launcher.actions.lock.LauncherAccessibilityService
 import de.jrpie.android.launcher.apps.AppFilter
 import de.jrpie.android.launcher.apps.hidePrivateSpaceWhenLocked
 import de.jrpie.android.launcher.apps.isPrivateSpaceSupported
@@ -132,6 +134,14 @@ enum class LauncherAction(
         R.drawable.baseline_settings_applications_24,
         ::expandSettingsPanel
     ),
+    RECENT_APPS(
+        "recent_apps",
+        R.string.list_other_recent_apps,
+        R.drawable.baseline_apps_24,
+        LauncherAccessibilityService::openRecentApps,
+        false,
+        { _ -> BuildConfig.USE_ACCESSIBILITY_SERVICE }
+    ),
     LOCK_SCREEN(
         "lock_screen",
         R.string.list_other_lock_screen,
@@ -142,7 +152,7 @@ enum class LauncherAction(
         "toggle_torch",
         R.string.list_other_torch,
         R.drawable.baseline_flashlight_on_24,
-        ::toggleTorch
+        ::toggleTorch,
     ),
     NOP("nop", R.string.list_other_nop, R.drawable.baseline_not_interested_24, {});
 

app/src/main/java/de/jrpie/android/launcher/actions/lock/LauncherAccessibilityService.kt

@@ -22,26 +22,44 @@ class LauncherAccessibilityService : AccessibilityService() {
 
     companion object {
         private const val TAG = "Launcher Accessibility"
+        private const val ACTION_REQUEST_ENABLE = "ACTION_REQUEST_ENABLE"
         const val ACTION_LOCK_SCREEN = "ACTION_LOCK_SCREEN"
+        const val ACTION_RECENT_APPS = "ACTION_RECENT_APPS"
 
-        fun lockScreen(context: Context) {
+        private fun invoke(context: Context, action: String, failureMessageRes: Int) {
             try {
                 context.startService(
                     Intent(
                         context,
                         LauncherAccessibilityService::class.java
                     ).apply {
-                        action = ACTION_LOCK_SCREEN
+                        this.action = action
                     })
-            } catch (e: Exception) {
+            } catch (_: Exception) {
                 Toast.makeText(
                     context,
-                    context.getString(R.string.alert_lock_screen_failed),
+                    context.getString(failureMessageRes),
                     Toast.LENGTH_LONG
                 ).show()
             }
         }
 
+        fun lockScreen(context: Context) {
+            if (!isEnabled(context)) {
+                showEnableDialog(context)
+            } else {
+                invoke(context, ACTION_LOCK_SCREEN, R.string.alert_lock_screen_failed)
+            }
+        }
+
+        fun openRecentApps(context: Context) {
+            if (!isEnabled(context)) {
+                showEnableDialog(context)
+            } else {
+                invoke(context, ACTION_RECENT_APPS, R.string.alert_recent_apps_failed)
+            }
+        }
+
         fun isEnabled(context: Context): Boolean {
             val enabledServices = Settings.Secure.getString(
                 context.contentResolver,
@@ -58,7 +76,7 @@ class LauncherAccessibilityService : AccessibilityService() {
                 setView(R.layout.dialog_consent_accessibility)
                 setTitle(R.string.dialog_consent_accessibility_title)
                 setPositiveButton(R.string.dialog_consent_accessibility_ok) { _, _ ->
-                    lockScreen(context)
+                    invoke(context, ACTION_REQUEST_ENABLE, R.string.alert_enable_accessibility_failed)
                 }
                 setNegativeButton(R.string.dialog_cancel) { _, _ -> }
             }.create().also { it.show() }.apply {
@@ -94,7 +112,9 @@ class LauncherAccessibilityService : AccessibilityService() {
             }
 
             when (action) {
+                ACTION_REQUEST_ENABLE -> {} // do nothing
                 ACTION_LOCK_SCREEN -> handleLockScreen()
+                ACTION_RECENT_APPS -> performGlobalAction(GLOBAL_ACTION_RECENTS)
             }
         }
         return super.onStartCommand(intent, flags, startId)

app/src/main/java/de/jrpie/android/launcher/actions/lock/LockMethod.kt

@@ -6,6 +6,7 @@ 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.actions.lock.LauncherAccessibilityService
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 
 

app/src/main/res/drawable/baseline_apps_24.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:textColor"
+        android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z" />
+
+</vector>

app/src/main/res/values/strings.xml

@@ -252,6 +252,7 @@
     <string name="list_other_track_previous">Music: Previous</string>
     <string name="list_other_track_play_pause">Music: Play / Pause</string>
     <string name="list_other_expand_notifications_panel">Expand notifications panel</string>
+    <string name="list_other_recent_apps">Recent Apps</string>
     <string name="list_other_nop">Do nothing</string>
     <string name="list_other_lock_screen">Lock Screen</string>
     <string name="list_other_torch">Toggle Torch</string>
@@ -307,6 +308,8 @@
     <string name="alert_no_torch_found">No camera with torch detected.</string>
     <string name="alert_torch_access_exception">Error: Can\'t access torch.</string>
     <string name="alert_lock_screen_failed">Error: Failed to lock screen. (If you just upgraded the app, try to disable and re-enable the accessibility service in phone settings)</string>
+    <string name="alert_recent_apps_failed">Error: Failed to show recent apps. (If you just upgraded the app, try to disable and re-enable the accessibility service in phone settings)</string>
+    <string name="alert_enable_accessibility_failed">Error: Failed to enable the accessibility service.</string>
     <string name="toast_accessibility_service_not_enabled">μLauncher\'s accessibility service is not enabled. Please enable it in settings</string>
     <string name="toast_private_space_locked">Private space locked</string>
     <string name="toast_private_space_unlocked">Private space unlocked</string>
@@ -315,12 +318,17 @@
     <string name="tooltip_lock_private_space">Lock private space</string>
     <string name="tooltip_unlock_private_space">Unlock private space</string>
     <string name="toast_lock_screen_not_supported">Error: Locking the screen using accessibility is not supported on this device. Please use device admin instead.</string>
-    <string name="accessibility_service_name">μLauncher - lock screen</string>
+    <string name="accessibility_service_name">μLauncher</string>
     <string name="accessibility_service_description">
-        Setting μLauncher as an accessibility service allows it to lock the screen.
+        Setting μLauncher as an accessibility service allows it to lock the screen and open the recent apps menu.
         Note that excessive permissions are required. You should never grant such permissions lightly to any app.
 
-        μLauncher will use the accessibility service only for locking the screen. You can check the source code to make sure.
+        μLauncher will use the accessibility service only for performing the following actions when requested by the user:
+
+        * lock screen
+        * open recent apps
+
+        μLauncher will never use the accessibility service to collect data. You can check the source code to make sure.
 
         Note that locking the screen can also be accomplished by granting μLauncher device administrator permissions. However that method doesn\'t work with fingerprint and face unlock.
     </string>
@@ -365,7 +373,12 @@
     <string name="dialog_consent_accessibility_other_options">I am aware that other options exist (using device administrator privileges or the power button).</string>
     <string name="dialog_consent_accessibility_consent">I consent to μLauncher using the accessibility service to provide functionality unrelated to accessibility.</string>
     <string name="dialog_consent_accessibility_data_collection">I consent to μLauncher not collecting any data.</string>
-    <string name="dialog_consent_accessibility_text"><![CDATA[You are about to activate the accessibility service. This will grant <strong>far-reaching privileges</strong> to μLauncher.<br/>μLauncher will use these privileges <strong>only to lock the screen</strong>. μLauncher <strong>will never collect any data</strong>. In particular, μLauncher does not use the accessibility service to collect any data.]]></string>
+    <string name="dialog_consent_accessibility_text"><![CDATA[You are about to activate the accessibility service. This will grant <strong>far-reaching privileges</strong> to μLauncher.<br/>μLauncher will use these privileges <strong>only</strong> to perform the following actions:
+    <ul>
+        <li>Lock Screen</li>
+        <li>Recent Apps</li>
+    </ul>
+     μLauncher <strong>will never collect any data</strong>. In particular, μLauncher does not use the accessibility service to collect any data.]]></string>
     <string name="dialog_consent_accessibility_title">Activating the Accessibility Service</string>
     <string name="dialog_consent_accessibility_ok">Activate Accessibility Service</string>
     <string name="dialog_cancel">Cancel</string>