From c338e265aa0329a1028e14bf462c885105fa376c Mon Sep 17 00:00:00 2001
From: HJ ChangLiao <hjchangliao@google.com>
Date: Thu, 12 Apr 2018 16:29:33 +0800
Subject: [PATCH] Register ConnectDeviceFrag with new key

For inject dynamic pref driving mode to
ConnectDeviceDashboardFragment,
Register this frag with new key CONNECT.

Bug: 72458929
Test: make RunSettingsRoboTests
Change-Id: I41781ff2f8918f7923c53defff85ddd4afe7056d
---
 res/xml/connected_devices.xml                                 | 4 ++++
 .../android/settings/dashboard/DashboardFragmentRegistry.java | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index 030428f9fb6..57372bf5125 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -51,6 +51,9 @@
         settings:userRestriction="no_bluetooth"
         settings:platform_slice="true"/>
 
+    <PreferenceCategory
+        android:key="dashboard_tile_placeholder" />
+
     <SwitchPreference
         android:key="toggle_nfc"
         android:title="@string/nfc_quick_toggle_title"
@@ -61,4 +64,5 @@
         android:key="connection_preferences"
         android:title="@string/connected_device_connections_title"
         android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"/>
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index 22c7c8a27ff..7b7fb5bd0c4 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -24,6 +24,7 @@ import com.android.settings.accounts.AccountDetailDashboardFragment;
 import com.android.settings.applications.AppAndNotificationDashboardFragment;
 import com.android.settings.applications.DefaultAppSettings;
 import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
+import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
 import com.android.settings.development.DevelopmentSettingsDashboardFragment;
 import com.android.settings.deviceinfo.StorageDashboardFragment;
 import com.android.settings.fuelgauge.PowerUsageSummary;
@@ -60,6 +61,8 @@ public class DashboardFragmentRegistry {
         PARENT_TO_CATEGORY_KEY_MAP = new ArrayMap<>();
         PARENT_TO_CATEGORY_KEY_MAP.put(
                 NetworkDashboardFragment.class.getName(), CategoryKey.CATEGORY_NETWORK);
+        PARENT_TO_CATEGORY_KEY_MAP.put(ConnectedDeviceDashboardFragment.class.getName(),
+                CategoryKey.CATEGORY_CONNECT);
         PARENT_TO_CATEGORY_KEY_MAP.put(AdvancedConnectedDeviceDashboardFragment.class.getName(),
                 CategoryKey.CATEGORY_DEVICE);
         PARENT_TO_CATEGORY_KEY_MAP.put(AppAndNotificationDashboardFragment.class.getName(),