Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8ba3897 authored by Zhaoyu Su's avatar Zhaoyu Su Committed by android-build-merger
Browse files

Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc9 am: b69559f8 

am: 2c23e6ab

Change-Id: I99bb280fd1697d890a6f44cc8cb49e0eaadef325
parents b3ad03f0 2c23e6ab

AndroidManifest.xml

+4 −4
Original line number Diff line number Diff line
@@ -190,10 +190,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" />
@@ -3278,6 +3274,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" />