diff options
| author | Robert Greenwalt <robdroid@android.com> | 2011-09-15 15:00:29 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-15 15:00:29 -0700 |
| commit | bf118ffba7986dd3df41b68418edaf55f9432464 (patch) | |
| tree | 123610e41c3aed51a2504e4de824372a2bf707f7 /res | |
| parent | 943af0bc69048d827c3dd1b92daeaa2cf1b77145 (diff) | |
| parent | cd8b7c3d0bea0cfb5e5c55493a3b06f62f22700a (diff) | |
| download | packages_apps_settings-bf118ffba7986dd3df41b68418edaf55f9432464.zip packages_apps_settings-bf118ffba7986dd3df41b68418edaf55f9432464.tar.gz packages_apps_settings-bf118ffba7986dd3df41b68418edaf55f9432464.tar.bz2 | |
Merge "Modify ApnEditor app for new APN schema." into ics-factoryrom
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 16 | ||||
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/xml/apn_editor.xml | 13 |
3 files changed, 35 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index b722b78..44db767 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -520,6 +520,22 @@ <item>IPV4V6</item> </string-array> + <!-- Bearer Info used in APN editor --> + <string-array name="bearer_entries"> + <item>LTE</item> + <item>eHRPD</item> + <item>Unspecified</item> + </string-array> + + <string-array translatable="false" name="bearer_values"> + <!-- Do not translate. --> + <item>14</item> + <!-- Do not translate. --> + <item>13</item> + <!-- Do not translate. --> + <item>0</item> + </string-array> + <!-- Apps on SD instalaltion location options in ApplicationSettings --> <string-array name="app_install_location_entries"> <item>Internal device storage</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index d32ecc2..863d66c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1872,6 +1872,12 @@ <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 enable/disable of APN --> + <string name="carrier_enabled">APN Enable/Disable</string> + <string name="carrier_enabled_summaryOn">APN Enabled</string> + <string name="carrier_enabled_summaryOff">APN Disabled</string> + <!-- Edit Beaerer Info of APN --> + <string name="bearer">Bearer</string> <!-- Edit access point screen menu option to delete this APN --> <string name="menu_delete">Delete APN</string> <!-- APNs screen menu option to create a brand spanking new APN --> diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml index f000dd0..e3ba934 100644 --- a/res/xml/apn_editor.xml +++ b/res/xml/apn_editor.xml @@ -121,4 +121,17 @@ android:entries="@array/apn_protocol_entries" android:entryValues="@array/apn_protocol_values" /> + <CheckBoxPreference + android:title="@string/carrier_enabled" + android:key="carrier_enabled" + android:enabled="false" + android:summaryOn="@string/carrier_enabled_summaryOn" + android:summaryOff="@@string/carrier_enabled_summaryOff" + /> + <ListPreference + android:title="@string/bearer" + android:key="bearer" + android:entries="@array/bearer_entries" + android:entryValues="@array/bearer_values" + /> </PreferenceScreen> |