From 41acc69edf9c2932578c922ac4e747c1f8f5ad93 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Sat, 17 Jun 2017 17:25:21 -0700
Subject: [PATCH] Enable Assist Gesture Settings to launch from action intent

Bug: 62540322

Test: adb shell am start -a android.settings.ASSIST_GESTURE_SETTINGS

Change-Id: I0aa0cc3ba87412626f6c24639efdd5e622b995e7
---
 AndroidManifest.xml                    | 12 ++++++++++++
 src/com/android/settings/Settings.java |  1 +
 2 files changed, 13 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cbf1eae63d..b2a8dd12a7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -405,6 +405,18 @@
                 android:value="com.android.settings.bluetooth.BluetoothSettings" />
         </activity>
 
+        <activity android:name="Settings$AssistGestureSettingsActivity"
+            android:label="@string/assist_gesture_title"
+            android:icon="@drawable/ic_settings_gestures"
+            android:taskAffinity="">
+            <intent-filter>
+                <action android:name="android.settings.ASSIST_GESTURE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.gestures.AssistGestureSettings" />
+        </activity>
+
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".bluetooth.BluetoothSettings"
                 android:label="@string/bluetooth_settings_title"
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 38b6e1b625..ab03c58377 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -32,6 +32,7 @@ public class Settings extends SettingsActivity {
     /*
     * Settings subclasses for launching independently.
     */
+    public static class AssistGestureSettingsActivity extends SettingsActivity { /* empty */}
     public static class BluetoothSettingsActivity extends SettingsActivity { /* empty */ }
     public static class SimSettingsActivity extends SettingsActivity { /* empty */ }
     public static class TetherSettingsActivity extends SettingsActivity { /* empty */ }
-- 
2.11.0