PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7b21e97c: Merge "Add "Roaming protocol" to APN editor." into ics-mr0

Browse Source 
* commit '7b21e97c2a213afbb7ab0d2247e751e8194f89fc':
  Add "Roaming protocol" to APN editor.
This commit is contained in:
John Huang
2011-10-17 15:22:28 -07:00
committed by Android Git Automerger
parent 1aa9c67783 7b21e97c2a
commit f9389c7ef0
3 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1915,6 +1915,8 @@
<string name="apn_type">APN type</string>
<!-- Edit access point labels: The protocol of the APN, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
<string name="apn_protocol">APN protocol</string>
<!-- Edit access point labels: The protocol of the APN when roaming, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
<string name="apn_roaming_protocol">APN roaming protocol</string>
<!-- Edit enable/disable of APN -->
<string name="carrier_enabled">APN enable/disable</string>
<string name="carrier_enabled_summaryOn">APN enabled</string>

7
res/xml/apn_editor.xml
View File

@@ -121,6 +121,13 @@
android:entries="@array/apn_protocol_entries"
android:entryValues="@array/apn_protocol_values"
/>
<ListPreference
android:title="@string/apn_roaming_protocol"
android:dialogTitle="@string/apn_roaming_protocol"
android:key="apn_roaming_protocol"
android:entries="@array/apn_protocol_entries"
android:entryValues="@array/apn_protocol_values"
/>
<CheckBoxPreference
android:title="@string/carrier_enabled"
android:key="carrier_enabled"