Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'fc3f2380c97b0e2704b6350e031c96e0b01a3046':
  Add configuration to control converting sms destination number
This commit is contained in:
Amit Mahajan
2014-11-07 00:24:27 +00:00
committed by Android Git Automerger
parent f82634324d fc3f2380c9
commit b0abe26dd9
5 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/res/res/values-mcc204-mnc04/config.xml
View File

@@ -38,4 +38,9 @@
1. Lenient threshold 1. Lenient threshold
--> -->
<integer name="config_LTE_RSRP_threshold_type">0</integer> <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> </resources>

5
core/res/res/values-mcc310-mnc004/config.xml
View File

@@ -34,4 +34,9 @@
</string-array> </string-array>
<bool name="config_auto_attach_data_on_creation">false</bool> <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> </resources>

4
core/res/res/values-mcc311-mnc480/config.xml
View File

@@ -56,4 +56,8 @@
1. Lenient threshold 1. Lenient threshold
--> -->
<integer name="config_LTE_RSRP_threshold_type">0</integer> <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> </resources>

16
core/res/res/values/config.xml
View File

@@ -1919,4 +1919,20 @@
<!-- Show the next-alarm as a zen exit condition if it occurs in the next n hours. --> <!-- 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> <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> </resources>

1
core/res/res/values/symbols.xml
View File

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