649751a4a8
Manually merge change I3aff03ebdc9dc165db66c5007a2fa987ab8cd822 due to merge conflicts. To show IMS registration state for each SIM, move the preference of IMS registration state from Status screen to SIM Status screen. Fixes: 66063299 Test: manual - Checked that the IMS registration state is displayed on the SIM Status screen. Test: make RunSettingsRoboTests Change-Id: Ic0713c357085d94b59605c1b924e7b56a362e256
139 lines
4.4 KiB
XML
139 lines
4.4 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright (C) 2017 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<PreferenceScreen
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:key="device_info_pref_screen"
|
|
android:title="@string/about_settings">
|
|
|
|
<!-- Phone number -->
|
|
<Preference
|
|
android:key="phone_number"
|
|
android:order="0"
|
|
android:title="@string/status_number"
|
|
android:summary="@string/summary_placeholder"/>
|
|
|
|
<!-- SIM status -->
|
|
<Preference
|
|
android:key="sim_status"
|
|
android:order="10"
|
|
android:title="@string/sim_status_title"
|
|
settings:keywords="@string/keywords_sim_status"
|
|
android:summary="@string/summary_placeholder"/>
|
|
|
|
<!-- Model & hardware -->
|
|
<Preference
|
|
android:key="device_model"
|
|
android:order="21"
|
|
android:title="@string/hardware_info"
|
|
settings:keywords="@string/keywords_model_and_hardware"
|
|
android:summary="@string/summary_placeholder"/>
|
|
|
|
<!-- IMEI -->
|
|
<Preference
|
|
android:key="imei_info"
|
|
android:order="22"
|
|
android:title="@string/status_imei"
|
|
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"
|
|
settings:keywords="@string/keywords_android_version"
|
|
android:summary="@string/summary_placeholder"/>
|
|
|
|
<!--IP address -->
|
|
<Preference
|
|
android:key="wifi_ip_address"
|
|
android:order="34"
|
|
android:title="@string/wifi_ip_address"
|
|
android:summary="@string/summary_placeholder"
|
|
settings:allowDividerAbove="true"/>
|
|
|
|
<!-- Wi-Fi MAC address -->
|
|
<Preference
|
|
android:key="wifi_mac_address"
|
|
android:order="35"
|
|
android:title="@string/status_wifi_mac_address"
|
|
android:summary="@string/summary_placeholder"/>
|
|
|
|
<!-- Bluetooth address -->
|
|
<Preference
|
|
android:key="bt_address"
|
|
android:order="36"
|
|
android:title="@string/status_bt_address"
|
|
android:summary="@string/summary_placeholder"/>
|
|
|
|
|
|
<!-- Legal information -->
|
|
<Preference
|
|
android:key="legal_container"
|
|
android:order="37"
|
|
android:title="@string/legal_information"
|
|
android:fragment="com.android.settings.LegalSettings"
|
|
settings:allowDividerAbove="true"/>
|
|
|
|
<!-- Regulatory labels -->
|
|
<Preference
|
|
android:key="regulatory_info"
|
|
android:order="38"
|
|
android:title="@string/regulatory_labels">
|
|
<intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
|
|
</Preference>
|
|
|
|
<!-- Safety & regulatory manual -->
|
|
<Preference
|
|
android:key="safety_info"
|
|
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="43"
|
|
android:title="@string/build_number"
|
|
android:summary="@string/summary_placeholder"
|
|
settings:allowDividerAbove="true"/>
|
|
|
|
</PreferenceScreen> |