Merge "Enable Assist Gesture Settings to launch from action intent" into oc-dr1-dev

This commit is contained in:
TreeHugger Robot
2017-06-21 02:52:00 +00:00
committed by Android (Google) Code Review
2 changed files with 13 additions and 0 deletions

View File

@@ -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"

View File

@@ -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 */ }