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

Merge changes Ibf5dc65b,I0cea3f76,I0dda78b4

Browse Source 
* changes:
  Phone number in about phone v2
  Dynamic preferences for sim status
  Dynamic preferences for IMEI
This commit is contained in:
Jeffrey Huang
2017-11-15 18:00:39 +00:00
committed by Android (Google) Code Review
parent 97e75e97ef ba76fbeb3b
commit f1b6d629bf
17 changed files with 584 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
res/xml/device_info_settings_v2.xml
View File

@@ -25,51 +25,43 @@
<!-- Phone number -->
<Preference
android:key="phone_number"
android:order="0"
android:title="@string/status_number"
android:summary="@string/summary_placeholder"/>
<!-- SIM status Sim Slot 1 -->
<!-- SIM status -->
<Preference
android:key="sim_status_sim_1"
android:key="sim_status"
android:order="10"
android:title="@string/sim_status_title"
android:summary="@string/summary_placeholder"/>
<!-- SIM status Sim Slot 2-->
<Preference
android:key="sim_status_sim_2"
android:title="@string/sim_status_title_sim_slot_2"
android:summary="@string/summary_placeholder"/>
<!-- Model & hardware -->
<Preference
android:key="device_model"
android:order="21"
android:title="@string/hardware_info"
android:summary="@string/summary_placeholder"/>
<!-- IMEI Sim Slot 1 -->
<!-- IMEI -->
<Preference
android:key="imei_info_sim_slot_1"
android:key="imei_info"
android:order="22"
android:title="@string/status_imei"
settings:keywords="@string/keywords_imei_info"
android:summary="@string/summary_placeholder"/>
<!-- IMEI Sim Slot 2 -->
<Preference
android:key="imei_info_sim_slot_2"
android:title="@string/imei_multi_sim_slot_2"
settings:keywords="@string/keywords_imei_info"
android:summary="@string/summary_placeholder"/>
<!-- Android version -->
<Preference
android:key="firmware_version"
android:order="32"
android:title="@string/firmware_version"
android:summary="@string/summary_placeholder"/>
<!--IP address -->
<Preference
android:key="wifi_ip_address"
android:order="33"
android:title="@string/wifi_ip_address"
android:summary="@string/summary_placeholder"
settings:allowDividerAbove="true"/>
@@ -77,12 +69,14 @@
<!-- Wi-Fi MAC address -->
<Preference
android:key="wifi_mac_address"
android:order="34"
android:title="@string/status_wifi_mac_address"
android:summary="@string/summary_placeholder"/>
<!-- Bluetooth address -->
<Preference
android:key="bt_address"
android:order="35"
android:title="@string/status_bt_address"
android:summary="@string/summary_placeholder"/>
@@ -90,6 +84,7 @@
<!-- Legal information -->
<Preference
android:key="legal_container"
android:order="36"
android:title="@string/legal_information"
android:fragment="com.android.settings.LegalSettings"
settings:allowDividerAbove="true"/>
@@ -97,6 +92,7 @@
<!-- Regulatory labels -->
<Preference
android:key="regulatory_info"
android:order="37"
android:title="@string/regulatory_labels">
<intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
</Preference>
@@ -104,6 +100,7 @@
<!-- Safety & regulatory manual -->
<Preference
android:key="safety_info"
android:order="38"
android:title="@string/safety_and_regulatory_info">
<intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
</Preference>
@@ -111,6 +108,7 @@
<!-- Build number -->
<Preference
android:key="build_number"
android:order="39"
android:title="@string/build_number"
android:summary="@string/summary_placeholder"
settings:allowDividerAbove="true"/>