commit dec7a719d16411d3f9d37bff7ffc4d4c6edb06f8
author Lei Yu <jackqdyulei@google.com> Thu Mar 29 10:54:22 2018 -0700
committer Lei Yu <jackqdyulei@google.com> Fri Mar 30 11:24:26 2018 -0700
tree 6909469de63e8976db9d4ea6eb1ed3e0907ada90
parent f3789adffd3054a7d843f07446d1537b92a39276

Remove the obsolete bluetooth code

Also update the shortcut:
1. Change the name to "Devices"
2. Change it point to "Connected device" page

Bug: 74806595
Fixes: 69926683
Test: robo test still pass

Change-Id: Ic57756fc955dc622cc22d0be64f02b5ae07a2915

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 100ac2c..17bb5ff 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -197,11 +197,6 @@
                 <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" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-            </intent-filter>
             <intent-filter android:priority="10">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
@@ -396,31 +391,29 @@
                        android:value="com.android.settings.ApnSettings" />
         </activity>
 
-        <activity
+        <!-- Keep compatibility with old shortcuts. -->
+        <activity-alias
             android:name="Settings$BluetoothSettingsActivity"
-            android:label="@string/bluetooth_settings_title"
-            android:icon="@drawable/ic_settings_bluetooth"
-            android:enabled="false"
-            android:taskAffinity="com.android.settings"
-            android:parentActivityName="Settings">
+            android:label="@string/devices_title"
+            android:targetActivity=".Settings$ConnectedDeviceDashboardActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-                <category android:name="com.android.settings.SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.bluetooth.BluetoothSettings" />
-        </activity>
+                android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment" />
+        </activity-alias>
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".bluetooth.BluetoothSettings"
-                        android:label="@string/bluetooth_settings_title"
+                        android:label="@string/devices_title"
                         android:targetActivity="Settings$BluetoothSettingsActivity"
                         android:exported="true"
                         android:clearTaskOnLaunch="true">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.bluetooth.BluetoothSettings" />
+                       android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment" />
         </activity-alias>
 
         <activity android:name="Settings$AssistGestureSettingsActivity"