commit 3d8e2c44cbd54b69d6e8a0c2b4d0eecebee4d9d5
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 01 04:52:34 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 01 04:52:34 2018 +0000
tree 05c8d83fd1d8f1aba16bdd973f1219a31a79d115
parent 6e5c590d0c747b2cf250651810c3f73fabe964e8
parent b4b448e9f5420ea35bcaac8bee4a3634d19f11b9

Merge "Enable the Advanced Connected settings."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 86cfbfc..d964534 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3197,16 +3197,11 @@
         <activity android:name="Settings$AdvancedConnectedDeviceActivity"
                   android:label="@string/connected_device_connections_title"
                   android:taskAffinity="com.android.settings"
-                  android:parentActivityName="Settings$ConnectedDeviceDashboardActivity"
-                  android:enabled="false">
+                  android:parentActivityName="Settings$ConnectedDeviceDashboardActivity">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.ADVANCED_CONNECTED_DEVICE_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" />
-            </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"