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

Commit c338e265 authored by HJ ChangLiao's avatar HJ ChangLiao
Browse files

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
parent 70bd0c6d

res/xml/connected_devices.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,9 @@ 
        settings:userRestriction="no_bluetooth"

        settings:userRestriction="no_bluetooth"

        settings:platform_slice="true"/>

        settings:platform_slice="true"/>





    <PreferenceCategory

        android:key="dashboard_tile_placeholder" />



    <SwitchPreference

    <SwitchPreference

        android:key="toggle_nfc"

        android:key="toggle_nfc"

        android:title="@string/nfc_quick_toggle_title"

        android:title="@string/nfc_quick_toggle_title"
@@ -61,4 +64,5 @@ 
        android:key="connection_preferences"

        android:key="connection_preferences"

        android:title="@string/connected_device_connections_title"

        android:title="@string/connected_device_connections_title"

        android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"/>

        android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"/>



</PreferenceScreen>
 
</PreferenceScreen>

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

+3 −0
Original line number Original line 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.AppAndNotificationDashboardFragment;

import com.android.settings.applications.DefaultAppSettings;

import com.android.settings.applications.DefaultAppSettings;

import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;

import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;

import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;

import com.android.settings.development.DevelopmentSettingsDashboardFragment;

import com.android.settings.development.DevelopmentSettingsDashboardFragment;

import com.android.settings.deviceinfo.StorageDashboardFragment;

import com.android.settings.deviceinfo.StorageDashboardFragment;

import com.android.settings.fuelgauge.PowerUsageSummary;

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 = new ArrayMap<>();

        PARENT_TO_CATEGORY_KEY_MAP.put(

        PARENT_TO_CATEGORY_KEY_MAP.put(

                NetworkDashboardFragment.class.getName(), CategoryKey.CATEGORY_NETWORK);

                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(),

        PARENT_TO_CATEGORY_KEY_MAP.put(AdvancedConnectedDeviceDashboardFragment.class.getName(),

                CategoryKey.CATEGORY_DEVICE);

                CategoryKey.CATEGORY_DEVICE);

        PARENT_TO_CATEGORY_KEY_MAP.put(AppAndNotificationDashboardFragment.class.getName(),

        PARENT_TO_CATEGORY_KEY_MAP.put(AppAndNotificationDashboardFragment.class.getName(),