Merge "Enable the Advanced Connected settings."
This commit is contained in:
committed by
Android (Google) Code Review
commit
3d8e2c44cb
@@ -3197,16 +3197,11 @@
|
|||||||
<activity android:name="Settings$AdvancedConnectedDeviceActivity"
|
<activity android:name="Settings$AdvancedConnectedDeviceActivity"
|
||||||
android:label="@string/connected_device_connections_title"
|
android:label="@string/connected_device_connections_title"
|
||||||
android:taskAffinity="com.android.settings"
|
android:taskAffinity="com.android.settings"
|
||||||
android:parentActivityName="Settings$ConnectedDeviceDashboardActivity"
|
android:parentActivityName="Settings$ConnectedDeviceDashboardActivity">
|
||||||
android:enabled="false">
|
|
||||||
<intent-filter android:priority="1">
|
<intent-filter android:priority="1">
|
||||||
<action android:name="com.android.settings.ADVANCED_CONNECTED_DEVICE_SETTINGS" />
|
<action android:name="com.android.settings.ADVANCED_CONNECTED_DEVICE_SETTINGS" />
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
</intent-filter>
|
</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"
|
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
|
||||||
android:value="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment" />
|
android:value="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment" />
|
||||||
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
|
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
|
||||||
|
Reference in New Issue
Block a user