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

Copy controllers from about phone v1 to v2

Browse Source 
- Add feedback, device fcc, and manual controllers

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Id2aeaa3a18cc83360e252df32f19a69ecd12f59f
This commit is contained in:
jeffreyhuang
2017-11-15 14:51:22 -08:00
parent e50254dce0
commit 6182c048af
2 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
res/xml/device_info_settings_v2.xml
View File

@@ -58,10 +58,17 @@
android:title="@string/firmware_version"
android:summary="@string/summary_placeholder"/>
<!-- IMS registration -->
<Preference
android:key="ims_reg_state"
android:order="33"
android:title="@string/ims_reg_title"
android:summary="@string/summary_placeholder"/>
<!--IP address -->
<Preference
android:key="wifi_ip_address"
android:order="33"
android:order="34"
android:title="@string/wifi_ip_address"
android:summary="@string/summary_placeholder"
settings:allowDividerAbove="true"/>
@@ -69,14 +76,14 @@
<!-- Wi-Fi MAC address -->
<Preference
android:key="wifi_mac_address"
android:order="34"
android:order="35"
android:title="@string/status_wifi_mac_address"
android:summary="@string/summary_placeholder"/>
<!-- Bluetooth address -->
<Preference
android:key="bt_address"
android:order="35"
android:order="36"
android:title="@string/status_bt_address"
android:summary="@string/summary_placeholder"/>
@@ -84,7 +91,7 @@
<!-- Legal information -->
<Preference
android:key="legal_container"
android:order="36"
android:order="37"
android:title="@string/legal_information"
android:fragment="com.android.settings.LegalSettings"
settings:allowDividerAbove="true"/>
@@ -92,7 +99,7 @@
<!-- Regulatory labels -->
<Preference
android:key="regulatory_info"
android:order="37"
android:order="38"
android:title="@string/regulatory_labels">
<intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
</Preference>
@@ -100,15 +107,36 @@
<!-- Safety & regulatory manual -->
<Preference
android:key="safety_info"
android:order="38"
android:order="39"
android:title="@string/safety_and_regulatory_info">
<intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
</Preference>
<!-- Manual -->
<Preference
android:key="manual"
android:order="40"
android:title="@string/manual">
<intent android:action="android.settings.SHOW_MANUAL"/>
</Preference>
<!-- Feedback on the device -->
<Preference
android:key="device_feedback"
android:order="41"
android:title="@string/device_feedback"/>
<!-- Device FCC equipment id -->
<Preference
android:key="fcc_equipment_id"
android:order="42"
android:title="@string/fcc_equipment_id"
android:summary="@string/summary_placeholder"/>
<!-- Build number -->
<Preference
android:key="build_number"
android:order="39"
android:order="43"
android:title="@string/build_number"
android:summary="@string/summary_placeholder"
settings:allowDividerAbove="true"/>

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

@@ -35,6 +35,7 @@ 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.ImsStatusPreferenceController;
import com.android.settings.deviceinfo.IpAddressPreferenceController;
import com.android.settings.deviceinfo.KernelVersionPreferenceController;
import com.android.settings.deviceinfo.ManualPreferenceController;
@@ -139,6 +140,8 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
controllers.add(new FirmwareVersionPreferenceControllerV2(context, fragment));
controllers.add(new ImsStatusPreferenceController(context, lifecycle));
controllers.add(new IpAddressPreferenceController(context, lifecycle));
controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
@@ -149,6 +152,12 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
controllers.add(new SafetyInfoPreferenceController(context));
controllers.add(new ManualPreferenceController(context));
controllers.add(new FeedbackPreferenceController(fragment, context));
controllers.add(new FccEquipmentIdPreferenceController(context));
controllers.add(
new BuildNumberPreferenceController(context, activity, fragment, lifecycle));