Add a gap in the ordering for phone numbers.

Previously there was no gap which caused the second phone number to show below
Emergency info.

Fixes: 131378898
Test: visual inspection
Change-Id: If98d3442562d44f65a6e5ce896b71ee093d8616c
This commit is contained in:
Andrew Sapperstein
2019-04-26 14:00:53 -07:00
parent 59ed4712ed
commit 10cfaa0b7e

View File

@@ -57,7 +57,7 @@
<Preference <Preference
android:key="emergency_info" android:key="emergency_info"
android:order="4" android:order="14"
android:title="@string/emergency_info_title" android:title="@string/emergency_info_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
settings:controller="com.android.settings.accounts.EmergencyInfoPreferenceController"/> settings:controller="com.android.settings.accounts.EmergencyInfoPreferenceController"/>
@@ -65,7 +65,7 @@
<!-- Legal information --> <!-- Legal information -->
<Preference <Preference
android:key="legal_container" android:key="legal_container"
android:order="5" android:order="15"
android:title="@string/legal_information" android:title="@string/legal_information"
android:fragment="com.android.settings.LegalSettings" android:fragment="com.android.settings.LegalSettings"
settings:allowDividerAbove="true" settings:allowDividerAbove="true"
@@ -74,7 +74,7 @@
<!-- Regulatory labels --> <!-- Regulatory labels -->
<Preference <Preference
android:key="regulatory_info" android:key="regulatory_info"
android:order="6" android:order="16"
android:title="@string/regulatory_labels"> android:title="@string/regulatory_labels">
<intent android:action="android.settings.SHOW_REGULATORY_INFO"/> <intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
</Preference> </Preference>
@@ -82,7 +82,7 @@
<!-- Safety & regulatory manual --> <!-- Safety & regulatory manual -->
<Preference <Preference
android:key="safety_info" android:key="safety_info"
android:order="7" android:order="17"
android:title="@string/safety_and_regulatory_info"> android:title="@string/safety_and_regulatory_info">
<intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/> <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
</Preference> </Preference>
@@ -90,7 +90,7 @@
<!-- SIM status --> <!-- SIM status -->
<Preference <Preference
android:key="sim_status" android:key="sim_status"
android:order="8" android:order="18"
android:title="@string/sim_status_title" android:title="@string/sim_status_title"
settings:keywords="@string/keywords_sim_status" settings:keywords="@string/keywords_sim_status"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
@@ -99,7 +99,7 @@
<!-- Model & hardware --> <!-- Model & hardware -->
<Preference <Preference
android:key="device_model" android:key="device_model"
android:order="21" android:order="31"
android:title="@string/hardware_info" android:title="@string/hardware_info"
settings:keywords="@string/keywords_model_and_hardware" settings:keywords="@string/keywords_model_and_hardware"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
@@ -109,7 +109,7 @@
<!-- IMEI --> <!-- IMEI -->
<Preference <Preference
android:key="imei_info" android:key="imei_info"
android:order="22" android:order="32"
android:title="@string/status_imei" android:title="@string/status_imei"
settings:keywords="@string/keywords_imei_info" settings:keywords="@string/keywords_imei_info"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
@@ -118,7 +118,7 @@
<!-- Android version --> <!-- Android version -->
<Preference <Preference
android:key="firmware_version" android:key="firmware_version"
android:order="32" android:order="42"
android:title="@string/firmware_version" android:title="@string/firmware_version"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings" android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings"
@@ -127,7 +127,7 @@
<!--IP address --> <!--IP address -->
<Preference <Preference
android:key="wifi_ip_address" android:key="wifi_ip_address"
android:order="34" android:order="44"
android:title="@string/wifi_ip_address" android:title="@string/wifi_ip_address"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:selectable="false" android:selectable="false"
@@ -137,7 +137,7 @@
<!-- Wi-Fi MAC address --> <!-- Wi-Fi MAC address -->
<Preference <Preference
android:key="wifi_mac_address" android:key="wifi_mac_address"
android:order="35" android:order="45"
android:title="@string/status_wifi_mac_address" android:title="@string/status_wifi_mac_address"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:selectable="false" android:selectable="false"
@@ -146,7 +146,7 @@
<!-- Bluetooth address --> <!-- Bluetooth address -->
<Preference <Preference
android:key="bt_address" android:key="bt_address"
android:order="36" android:order="46"
android:title="@string/status_bt_address" android:title="@string/status_bt_address"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:selectable="false" android:selectable="false"
@@ -155,7 +155,7 @@
<!-- Device up time --> <!-- Device up time -->
<Preference <Preference
android:key="up_time" android:key="up_time"
android:order="37" android:order="47"
android:title="@string/status_up_time" android:title="@string/status_up_time"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:selectable="false"/> android:selectable="false"/>
@@ -163,7 +163,7 @@
<!-- Manual --> <!-- Manual -->
<Preference <Preference
android:key="manual" android:key="manual"
android:order="40" android:order="50"
android:title="@string/manual"> android:title="@string/manual">
<intent android:action="android.settings.SHOW_MANUAL"/> <intent android:action="android.settings.SHOW_MANUAL"/>
</Preference> </Preference>
@@ -171,21 +171,21 @@
<!-- Feedback on the device --> <!-- Feedback on the device -->
<Preference <Preference
android:key="device_feedback" android:key="device_feedback"
android:order="41" android:order="51"
android:title="@string/device_feedback" android:title="@string/device_feedback"
settings:keywords="@string/keywords_device_feedback"/> settings:keywords="@string/keywords_device_feedback"/>
<!-- Device FCC equipment id --> <!-- Device FCC equipment id -->
<Preference <Preference
android:key="fcc_equipment_id" android:key="fcc_equipment_id"
android:order="42" android:order="52"
android:title="@string/fcc_equipment_id" android:title="@string/fcc_equipment_id"
android:summary="@string/summary_placeholder"/> android:summary="@string/summary_placeholder"/>
<!-- Build number --> <!-- Build number -->
<Preference <Preference
android:key="build_number" android:key="build_number"
android:order="43" android:order="53"
android:title="@string/build_number" android:title="@string/build_number"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
settings:allowDividerAbove="true" settings:allowDividerAbove="true"