diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2013-03-17 09:31:04 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-17 09:31:04 -0700 |
commit | 3c8a4c3b5939bb9134900266c12f67e33919675e (patch) | |
tree | c3caccf0906eaac71121b7c3c3a996ef892a08a7 /res | |
parent | 474958fc670e18347b2135d0ffd118f921ad7ccb (diff) | |
parent | cd1c38cf23e640d878767e189e10dbf26b6a0141 (diff) | |
download | packages_apps_Settings-3c8a4c3b5939bb9134900266c12f67e33919675e.zip packages_apps_Settings-3c8a4c3b5939bb9134900266c12f67e33919675e.tar.gz packages_apps_Settings-3c8a4c3b5939bb9134900266c12f67e33919675e.tar.bz2 |
am cd1c38cf: am ae9ebfd1: Merge "add MVNO field for APN Editor"
* commit 'cd1c38cf23e640d878767e189e10dbf26b6a0141':
add MVNO field for APN Editor
Diffstat (limited to 'res')
-rw-r--r-- | res/values/arrays.xml | 23 | ||||
-rw-r--r-- | res/values/strings.xml | 4 | ||||
-rw-r--r-- | res/xml/apn_editor.xml | 13 |
3 files changed, 40 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 00b07ec..1a11ebb 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -547,6 +547,29 @@ <item>0</item> </string-array> + <!-- MVNO Info used in APN editor --> + <string-array name="mvno_type_entries"> + <!-- Do not translate. --> + <item>None</item> + <!-- Do not translate. --> + <item>SPN</item> + <!-- Do not translate. --> + <item>IMSI</item> + <!-- Do not translate. --> + <item>GID</item> + </string-array> + + <string-array translatable="false" name="mvno_type_values"> + <!-- Do not translate. --> + <item></item> + <!-- Do not translate. --> + <item>spn</item> + <!-- Do not translate. --> + <item>imsi</item> + <!-- Do not translate. --> + <item>gid</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 921b9e5..1e19d28 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2121,6 +2121,10 @@ <string name="carrier_enabled_summaryOff">APN disabled</string> <!-- Edit Beaerer Info of APN --> <string name="bearer">Bearer</string> + <!-- Edit Mvno Type Info of APN --> + <string name="mvno_type">MVNO type</string> + <!-- Edit Mvno Match Data Info of APN --> + <string name="mvno_match_data">MVNO value</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 604a349..745a83e 100644 --- a/res/xml/apn_editor.xml +++ b/res/xml/apn_editor.xml @@ -141,4 +141,17 @@ android:entries="@array/bearer_entries" android:entryValues="@array/bearer_values" /> + <ListPreference + android:title="@string/mvno_type" + android:key="mvno_type" + android:entries="@array/mvno_type_entries" + android:entryValues="@array/mvno_type_values" + /> + <EditTextPreference + android:title="@string/mvno_match_data" + android:dialogTitle="@string/mvno_match_data" + android:key="mvno_match_data" + android:singleLine="true" + android:inputType="text" + /> </PreferenceScreen> |