Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28041fb8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 9470271d c338e265

res/xml/connected_devices.xml

+4 −0
Original line number Diff line number Diff line
@@ -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

+3 −0
Original line number Diff line number Diff line
@@ -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(),