PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 8dbfc66a74

Change-Id: Id8c0f3ee9de9796a6ce4e595714270a61e91d086
This commit is contained in:
Kevin Chyn
2017-06-21 03:29:23 +00:00
committed by android-build-merger
parent fe8de086ac 8dbfc66a74
commit 6d0725d6a1
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AndroidManifest.xml
View File

@@ -405,6 +405,18 @@
android:value="com.android.settings.bluetooth.BluetoothSettings" /> android:value="com.android.settings.bluetooth.BluetoothSettings" />
</activity> </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. --> <!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name=".bluetooth.BluetoothSettings" <activity-alias android:name=".bluetooth.BluetoothSettings"
android:label="@string/bluetooth_settings_title" android:label="@string/bluetooth_settings_title"

1
src/com/android/settings/Settings.java
View File

@@ -32,6 +32,7 @@ public class Settings extends SettingsActivity {
/* /*
* Settings subclasses for launching independently. * Settings subclasses for launching independently.
*/ */
public static class AssistGestureSettingsActivity extends SettingsActivity { /* empty */}
public static class BluetoothSettingsActivity extends SettingsActivity { /* empty */ } public static class BluetoothSettingsActivity extends SettingsActivity { /* empty */ }
public static class SimSettingsActivity extends SettingsActivity { /* empty */ } public static class SimSettingsActivity extends SettingsActivity { /* empty */ }
public static class TetherSettingsActivity extends SettingsActivity { /* empty */ } public static class TetherSettingsActivity extends SettingsActivity { /* empty */ }