From 6dd7f2eb38c88d83bc1508c4a78849177936099d Mon Sep 17 00:00:00 2001
From: jackqdyulei <jackqdyulei@google.com>
Date: Wed, 7 Feb 2018 17:49:09 -0800
Subject: [PATCH] Make ConnectedDevice page handles bt intent

Fixes: 73088883
Test: Manual - click the bt tile in quick settings
Change-Id: I147a9a83b37fff4a7573f792cd9172fef84110f2
---
 AndroidManifest.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c526d6fc245..64fffba84c6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -190,6 +190,10 @@
                 <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>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -429,13 +433,10 @@
         </activity>
 
         <activity android:name="Settings$BluetoothSettingsActivity"
-                android:label="@string/bluetooth_settings_title"
-                android:icon="@drawable/ic_settings_bluetooth"
-                android:taskAffinity="">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.BLUETOOTH_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+                  android:label="@string/bluetooth_settings_title"
+                  android:icon="@drawable/ic_settings_bluetooth"
+                  android:enabled="false"
+                  android:taskAffinity="">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />