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

Commit 67d9347b authored by Jeffrey Huang's avatar Jeffrey Huang Committed by Android (Google) Code Review
Browse files

Merge "Add connectivity controllers to about phone v2"

parents d854eec1 e72cd308

res/xml/device_info_settings_v2.xml

+3 −3
Original line number Diff line number Diff line
@@ -69,20 +69,20 @@ 


    <!--IP address -->

    <Preference

        android:key="ip_address"

        android:key="wifi_ip_address"

        android:title="@string/wifi_ip_address"

        android:summary="@string/summary_placeholder"

        settings:allowDividerAbove="true"/>



    <!-- Wi-Fi MAC address -->

    <Preference

        android:key="mac_address"

        android:key="wifi_mac_address"

        android:title="@string/status_wifi_mac_address"

        android:summary="@string/summary_placeholder"/>



    <!-- Bluetooth address -->

    <Preference

        android:key="bluetooth_address"

        android:key="bt_address"

        android:title="@string/status_bt_address"

        android:summary="@string/summary_placeholder"/>

src/com/android/settings/DeviceInfoSettings.java

+6 −3
Original line number Diff line number Diff line
@@ -27,11 +27,14 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 
import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.deviceinfo.BasebandVersionPreferenceController;

import com.android.settings.deviceinfo.BluetoothAddressPreferenceController;

import com.android.settings.deviceinfo.BuildNumberPreferenceController;

import com.android.settings.deviceinfo.DeviceModelPreferenceController;

import com.android.settings.deviceinfo.FccEquipmentIdPreferenceController;

import com.android.settings.deviceinfo.FeedbackPreferenceController;

import com.android.settings.deviceinfo.FirmwareVersionPreferenceController;

import com.android.settings.deviceinfo.IpAddressPreferenceController;

import com.android.settings.deviceinfo.WifiMacAddressPreferenceController;

import com.android.settings.deviceinfo.imei.ImeiInfoDualSimPreferenceController;

import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;

import com.android.settings.deviceinfo.KernelVersionPreferenceController;
@@ -141,11 +144,11 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 


            controllers.add(new FirmwareVersionPreferenceControllerV2(context, fragment));



            // IP address

            controllers.add(new IpAddressPreferenceController(context, lifecycle));



            // Wifi MAC address

            controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));



            // Bluetooth Address

            controllers.add(new BluetoothAddressPreferenceController(context, lifecycle));



            controllers.add(new RegulatoryInfoPreferenceController(context));