diff options
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 51de8024d8..2ccd4fe57c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -203,10 +203,6 @@ android:taskAffinity="com.android.settings" android:parentActivityName="Settings"> <intent-filter android:priority="1"> - <action android:name="android.settings.NFC_SETTINGS" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - <intent-filter android:priority="1"> <action android:name="android.settings.BLUETOOTH_SETTINGS" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> @@ -1487,7 +1483,6 @@ <activity android:name="Settings$TextToSpeechSettingsActivity" android:label="@string/tts_settings" - android:taskAffinity="com.android.settings" android:parentActivityName="Settings"> <intent-filter android:priority="1"> <action android:name="com.android.settings.TTS_SETTINGS" /> @@ -3120,6 +3115,10 @@ android:taskAffinity="com.android.settings" android:parentActivityName="Settings$ConnectedDeviceDashboardActivity"> <intent-filter android:priority="1"> + <action android:name="android.settings.NFC_SETTINGS" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <intent-filter android:priority="1"> <action android:name="com.android.settings.ADVANCED_CONNECTED_DEVICE_SETTINGS" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> |