Merge changes Ibf5dc65b,I0cea3f76,I0dda78b4

* 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
17 changed files with 584 additions and 841 deletions

View File

@@ -2664,9 +2664,7 @@
<!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
<string name="storage_settings_summary" product="default">Unmount SD card, view available storage</string>
<!-- About phone screen, title for IMEI for multi-sim devices -->
<string name="imei_multi_sim_slot_1">IMEI (sim slot 1)</string>
<!-- About phone screen, title for IMEI for multi-sim devices -->
<string name="imei_multi_sim_slot_2">IMEI (sim slot 2)</string>
<string name="imei_multi_sim">IMEI (sim slot %1$d)</string>
<!-- Do not translate. About phone, status item title -->
<string name="status_imei">IMEI</string>
<!-- Do not translate. About phone, status item title -->
@@ -2677,6 +2675,10 @@
<string name="status_number" product="tablet">MDN</string>
<!-- About phone, status item title. The phone number of the current device [CHAR LIMIT=30] -->
<string name="status_number" product="default">Phone number</string>
<!-- About tablet, status item title for multi-sim devices. The Mobile Directory Number [CHAR LIMIT=30] -->
<string name="status_number_sim_slot" product="tablet">MDN (sim slot %1$d)</string>
<!-- About phone, status item title for multi-sim devices. The phone number of the current device [CHAR LIMIT=30] -->
<string name="status_number_sim_slot" product="default">Phone number (sim slot %1$d)</string>
<!-- About tablet, status item title. The Mobile Directory Number [CHAR LIMIT=30] -->
<string name="status_number_sim_status" product="tablet">MDN on SIM</string>
<!-- About phone, status item title. The phone number of the current device [CHAR LIMIT=30] -->
@@ -2688,9 +2690,7 @@
<!-- About phone, status item title. The phone PRL Version of the current device.-->
<string name="status_prl_version">PRL version</string>
<!-- About phone screen, title for MEID for multi-sim devices -->
<string name="meid_multi_sim_sim_slot_1">MEID (sim slot 1)</string>
<!-- About phone screen, title for MEID for multi-sim devices -->
<string name="meid_multi_sim_sim_slot_2">MEID (sim slot 2)</string>
<string name="meid_multi_sim">MEID (sim slot %1$d)</string>
<!-- About phone, status item title. The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
<string name="status_meid_number">MEID</string>
<!-- About phone, status item title. The ICCID of the current LTE device. [CHAR LIMIT=30] -->
@@ -6447,9 +6447,7 @@
<!-- SIM status title [CHAR LIMIT=40] -->
<string name="sim_status_title">SIM status</string>
<!-- SIM status title [CHAR LIMIT=40] -->
<string name="sim_status_title_sim_slot_1">SIM status (sim slot 1)</string>
<!-- SIM status title [CHAR LIMIT=40] -->
<string name="sim_status_title_sim_slot_2">SIM status (sim slot 2)</string>
<string name="sim_status_title_sim_slot">SIM status (sim slot %1$d)</string>
<!-- Title for call back. [CHAR LIMIT=60] -->
<string name="sim_call_back_title">Call back from default SIM</string>
<!-- Title for outgoing back. [CHAR LIMIT=60] -->