diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-10-28 10:30:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-28 10:30:20 -0700 |
| commit | 760b45c2a688876b94383561163244de8086f1c6 (patch) | |
| tree | 32307afd74db8586c0618f27bd300e6a8bc82f25 /res | |
| parent | 0a4ab1eab20d5492bf7c87e348fd26d6c56889b9 (diff) | |
| parent | 195bc43460967e57e4c1131ba156083a93e0e4e8 (diff) | |
| download | packages_apps_settings-760b45c2a688876b94383561163244de8086f1c6.zip packages_apps_settings-760b45c2a688876b94383561163244de8086f1c6.tar.gz packages_apps_settings-760b45c2a688876b94383561163244de8086f1c6.tar.bz2 | |
am 195bc434: Add Authentication Type field to the APN settings.
Merge commit '195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-mr2
* commit '195bc43460967e57e4c1131ba156083a93e0e4e8':
Add Authentication Type field to the APN settings.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 19 | ||||
| -rw-r--r-- | res/xml/apn_editor.xml | 6 |
2 files changed, 25 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 6d8ca32..6b8214c 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -291,4 +291,23 @@ <item>中文 (繁體)</item> </string-array> + <!-- Authentication Types used in APN editor --> + <string-array name="apn_auth_entries"> + <item>None</item> + <item>PAP</item> + <item>CHAP</item> + <item>PAP or CHAP</item> + </string-array> + + <string-array translatable="false" name="apn_auth_values"> + <!-- Do not translate. --> + <item>0</item> + <!-- Do not translate. --> + <item>1</item> + <!-- Do not translate. --> + <item>2</item> + <!-- Do not translate. --> + <item>3</item> + </string-array> + </resources> diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml index 4ff801f..3835a2c 100644 --- a/res/xml/apn_editor.xml +++ b/res/xml/apn_editor.xml @@ -101,6 +101,12 @@ android:singleLine="true" android:inputType="number" /> + <ListPreference + android:title="@string/apn_auth_type" + android:key="auth_type" + android:entries="@array/apn_auth_entries" + android:entryValues="@array/apn_auth_values" + /> <EditTextPreference android:title="@string/apn_type" android:dialogTitle="@string/apn_type" |