diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2009-06-26 01:07:01 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-26 01:07:01 -0700 |
| commit | 776be77313316ceb25e4d8d8312c1446a98d2de3 (patch) | |
| tree | d529f735a55aa27f9ab611292560e36a64fa105b /res/xml | |
| parent | 620965ccc58a7623d564300eeee97ab5d77e1480 (diff) | |
| parent | e7565f3c48e6c90e65d9c15e33d20673a187c156 (diff) | |
| download | packages_apps_settings-776be77313316ceb25e4d8d8312c1446a98d2de3.zip packages_apps_settings-776be77313316ceb25e4d8d8312c1446a98d2de3.tar.gz packages_apps_settings-776be77313316ceb25e4d8d8312c1446a98d2de3.tar.bz2 | |
am e7565f3c: Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.
Merge commit 'e7565f3c48e6c90e65d9c15e33d20673a187c156'
* commit 'e7565f3c48e6c90e65d9c15e33d20673a187c156':
Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/vpn_edit.xml | 5 | ||||
| -rw-r--r-- | res/xml/vpn_settings.xml | 2 | ||||
| -rw-r--r-- | res/xml/vpn_type.xml | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/res/xml/vpn_edit.xml b/res/xml/vpn_edit.xml index 7976242..a3cab9c 100644 --- a/res/xml/vpn_edit.xml +++ b/res/xml/vpn_edit.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project +<!-- Copyright (C) 2009 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,10 +18,9 @@ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> <EditTextPreference + android:key="vpn_name" android:title="@string/vpn_name" android:dialogTitle="@string/vpn_name" - android:key="vpn_name" - android:summary="@string/vpn_name_summary" android:singleLine="true"/> </PreferenceScreen> diff --git a/res/xml/vpn_settings.xml b/res/xml/vpn_settings.xml index a1a4bf9..773ae1c 100644 --- a/res/xml/vpn_settings.xml +++ b/res/xml/vpn_settings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project +<!-- Copyright (C) 2009 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/res/xml/vpn_type.xml b/res/xml/vpn_type.xml index c59b54a..fbc7822 100644 --- a/res/xml/vpn_type.xml +++ b/res/xml/vpn_type.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project +<!-- Copyright (C) 2009 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. |