Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev

This commit is contained in:
Amit Mahajan
2014-11-07 00:17:40 +00:00
committed by Android (Google) Code Review
5 changed files with 31 additions and 0 deletions

View File

@@ -38,4 +38,9 @@
1. Lenient threshold
-->
<integer name="config_LTE_RSRP_threshold_type">0</integer>
<string-array translatable="false" name="config_sms_convert_destination_number_support">
<item>true;BAE0000000000000</item>
<item>false</item>
</string-array>
</resources>

View File

@@ -34,4 +34,9 @@
</string-array>
<bool name="config_auto_attach_data_on_creation">false</bool>
<string-array translatable="false" name="config_sms_convert_destination_number_support">
<item>true</item>
</string-array>
</resources>

View File

@@ -56,4 +56,8 @@
1. Lenient threshold
-->
<integer name="config_LTE_RSRP_threshold_type">0</integer>
<string-array translatable="false" name="config_sms_convert_destination_number_support">
<item>true</item>
</string-array>
</resources>

View File

@@ -1919,4 +1919,20 @@
<!-- Show the next-alarm as a zen exit condition if it occurs in the next n hours. -->
<integer name="config_next_alarm_condition_lookahead_threshold_hrs">12</integer>
<!-- This config is used to check if the carrier requires converting destination
number before sending out a SMS.
Formats for this configuration as below:
[true or false][;optional gid]
The logic to pick up the configuration:
(1) If the "config_sms_convert_destination_number_support" array has no gid
special item, the last one will be picked
(2) If the "config_sms_convert_destination_number_support" array has gid special
item and it matches the current sim's gid, it will be picked.
(3) If the "config_sms_convert_destination_number_support" array has gid special
item but it doesn't match the current sim's gid, the last one without gid
will be picked -->
<string-array translatable="false" name="config_sms_convert_destination_number_support">
<item>false</item>
</string-array>
</resources>

View File

@@ -2105,6 +2105,7 @@
<java-symbol type="layout" name="simple_account_item" />
<java-symbol type="id" name="scrollIndicatorUp" />
<java-symbol type="id" name="scrollIndicatorDown" />
<java-symbol type="array" name="config_sms_convert_destination_number_support" />
<!-- From SignalStrength -->
<java-symbol type="integer" name="config_LTE_RSRP_threshold_type" />