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

Commit 2c93b071 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Make ConnectedDevice page handles bt intent"

parents c9f1d89d 6dd7f2eb

AndroidManifest.xml

+8 −7
Original line number Original line Diff line number Diff line
@@ -190,6 +190,10 @@ 
                <action android:name="android.settings.NFC_SETTINGS" />

                <action android:name="android.settings.NFC_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            </intent-filter>

            <intent-filter android:priority="1">

                <action android:name="android.settings.BLUETOOTH_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -431,11 +435,8 @@ 
        <activity android:name="Settings$BluetoothSettingsActivity"

        <activity android:name="Settings$BluetoothSettingsActivity"

                  android:label="@string/bluetooth_settings_title"

                  android:label="@string/bluetooth_settings_title"

                  android:icon="@drawable/ic_settings_bluetooth"

                  android:icon="@drawable/ic_settings_bluetooth"

                  android:enabled="false"

                  android:taskAffinity="">

                  android:taskAffinity="">

            <intent-filter android:priority="1">

                <action android:name="android.settings.BLUETOOTH_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />