am ed7ccb45: am 77348365: Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev

* commit 'ed7ccb45c0ffe5de22af68904ddba4f515eb3f10':
  Set network selection to automatic when in Global mode
This commit is contained in:
Amit Mahajan
2014-11-25 17:37:37 +00:00
committed by Android Git Automerger
5 changed files with 7 additions and 1 deletions

2
core/res/res/values-mcc204-mnc04/config.xml Normal file → Executable file
View File

@@ -63,4 +63,6 @@
<item>Vodafone NL,live.vodafone.com,,,vodafone,vodafone,,,,,204,04,,DUN</item>
<item>[ApnSettingV3]SaskTel Tethering,inet.stm.sk.ca,,,,,,,,,204,04,,DUN,,,true,0,,,,,,,gid,5A</item>
</string-array>
<string translatable="false" name="prohibit_manual_network_selection_in_gobal_mode">true;BAE0000000000000</string>
</resources>

2
core/res/res/values-mcc310-mnc004/config.xml Normal file → Executable file
View File

@@ -38,5 +38,5 @@
<string-array translatable="false" name="config_sms_convert_destination_number_support">
<item>true</item>
</string-array>
<string translatable="false" name="prohibit_manual_network_selection_in_gobal_mode">true</string>
</resources>

1
core/res/res/values-mcc311-mnc480/config.xml Normal file → Executable file
View File

@@ -60,4 +60,5 @@
<string-array translatable="false" name="config_sms_convert_destination_number_support">
<item>true</item>
</string-array>
<string translatable="false" name="prohibit_manual_network_selection_in_gobal_mode">true</string>
</resources>

2
core/res/res/values/config.xml Normal file → Executable file
View File

@@ -1950,4 +1950,6 @@
<!-- The maximum bitmap size that can be written to a MediaMetadata object. This value
is the max width/height allowed in dips.-->
<dimen name="config_mediaMetadataBitmapMaxSize">320dp</dimen>
<string translatable="false" name="prohibit_manual_network_selection_in_gobal_mode">false</string>
</resources>

1
core/res/res/values/symbols.xml Normal file → Executable file
View File

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