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

Commit e72cd308 authored by jeffreyhuang's avatar jeffreyhuang
Browse files

Add connectivity controllers to about phone v2 

 - Add IpAddressPreferenceController
 - Add WifiMacAddressPreferenceController
 - Add BluetoothAddressPreferenceController

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Idf55784721d28ac27b1b8186e26268e21c40688e
parent d7233945

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;
@@ -140,11 +143,11 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 


            // Android version



            // 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));