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

Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc96a am: b69559f882 am: 2c23e6ab75

Browse Source 
am: d8ba38975b

Change-Id: I699ec762b84fcfe47acf7a98bd7cc4803c9fb9cb
This commit is contained in:
Zhaoyu Su
2018-08-09 16:59:12 -07:00
committed by android-build-merger
parent 112301bc83 d8ba38975b
commit dbe5c0cd51
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AndroidManifest.xml
View File

@@ -201,10 +201,6 @@
android:icon="@drawable/ic_homepage_connected_device"
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" />
@@ -3110,6 +3106,10 @@
android:label="@string/connected_device_connections_title"
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" />