PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add connectivity controllers to about phone v2

Browse Source 
- Add IpAddressPreferenceController
 - Add WifiMacAddressPreferenceController
 - Add BluetoothAddressPreferenceController

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Idf55784721d28ac27b1b8186e26268e21c40688e
This commit is contained in:
jeffreyhuang
2017-11-06 11:46:17 -08:00
parent d723394569
commit e72cd30868
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/device_info_settings_v2.xml
View File

@@ -69,20 +69,20 @@
<!--IP address --> <!--IP address -->
<Preference <Preference
android:key="ip_address" android:key="wifi_ip_address"
android:title="@string/wifi_ip_address" android:title="@string/wifi_ip_address"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
settings:allowDividerAbove="true"/> settings:allowDividerAbove="true"/>
<!-- Wi-Fi MAC address --> <!-- Wi-Fi MAC address -->
<Preference <Preference
android:key="mac_address" android:key="wifi_mac_address"
android:title="@string/status_wifi_mac_address" android:title="@string/status_wifi_mac_address"
android:summary="@string/summary_placeholder"/> android:summary="@string/summary_placeholder"/>
<!-- Bluetooth address --> <!-- Bluetooth address -->
<Preference <Preference
android:key="bluetooth_address" android:key="bt_address"
android:title="@string/status_bt_address" android:title="@string/status_bt_address"
android:summary="@string/summary_placeholder"/> android:summary="@string/summary_placeholder"/>

9
src/com/android/settings/DeviceInfoSettings.java
View File

@@ -27,11 +27,14 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader; import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.deviceinfo.BasebandVersionPreferenceController; import com.android.settings.deviceinfo.BasebandVersionPreferenceController;
import com.android.settings.deviceinfo.BluetoothAddressPreferenceController;
import com.android.settings.deviceinfo.BuildNumberPreferenceController; import com.android.settings.deviceinfo.BuildNumberPreferenceController;
import com.android.settings.deviceinfo.DeviceModelPreferenceController; import com.android.settings.deviceinfo.DeviceModelPreferenceController;
import com.android.settings.deviceinfo.FccEquipmentIdPreferenceController; import com.android.settings.deviceinfo.FccEquipmentIdPreferenceController;
import com.android.settings.deviceinfo.FeedbackPreferenceController; import com.android.settings.deviceinfo.FeedbackPreferenceController;
import com.android.settings.deviceinfo.FirmwareVersionPreferenceController; 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.ImeiInfoDualSimPreferenceController;
import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2; import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
import com.android.settings.deviceinfo.KernelVersionPreferenceController; import com.android.settings.deviceinfo.KernelVersionPreferenceController;
@@ -140,11 +143,11 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
// Android version // 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)); controllers.add(new RegulatoryInfoPreferenceController(context));