commit 28041fb8cd92872cdd0b569fe84e2f367194e6ca
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Apr 14 23:12:48 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 14 23:12:48 2018 +0000
tree c18e05fd58fd6de819da09b5062a6d8f84cb7a43
parent 9470271d8549f26b857508ed1e32986a5e01cb62
parent c338e265aa0329a1028e14bf462c885105fa376c

Merge "Register ConnectDeviceFrag with new key" into pi-dev

res/xml/connected_devices.xml

diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index 390a33d..4a3c4f2 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -49,6 +49,9 @@
         android:icon="@drawable/ic_settings_bluetooth"
         settings:allowDividerAbove="true"/>
 
+    <PreferenceCategory
+        android:key="dashboard_tile_placeholder" />
+
     <SwitchPreference
         android:key="toggle_nfc"
         android:title="@string/nfc_quick_toggle_title"
@@ -59,4 +62,5 @@
         android:key="connection_preferences"
         android:title="@string/connected_device_connections_title"
         android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"/>
+
 </PreferenceScreen>

src/com/android/settings/dashboard/DashboardFragmentRegistry.java

diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index 22c7c8a..7b7fb5b 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.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 @@
         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(),