diff options
| author | Neel Parekh <neel@google.com> | 2009-10-22 18:26:46 -0700 |
|---|---|---|
| committer | Neel Parekh <neel@google.com> | 2009-10-22 18:26:46 -0700 |
| commit | 0bc64d45b418c70dca77a74ddbea62612ae4fe19 (patch) | |
| tree | 8a2ed527a59ee12fae8fdc3f2bcfe2486377ecbc /res | |
| parent | 53250b3aa8c85adb31bfe9db30907f72acab7103 (diff) | |
| parent | e304b9f4f7f5bf07522fcc05615d172abd6c52a3 (diff) | |
| download | packages_apps_settings-0bc64d45b418c70dca77a74ddbea62612ae4fe19.zip packages_apps_settings-0bc64d45b418c70dca77a74ddbea62612ae4fe19.tar.gz packages_apps_settings-0bc64d45b418c70dca77a74ddbea62612ae4fe19.tar.bz2 | |
resolved conflicts for merge of e304b9f4 to eclair-mr2
Diffstat (limited to 'res')
| -rw-r--r-- | res/xml/wifi_access_points.xml | 30 | ||||
| -rw-r--r-- | res/xml/wifi_settings.xml | 4 |
2 files changed, 32 insertions, 2 deletions
diff --git a/res/xml/wifi_access_points.xml b/res/xml/wifi_access_points.xml new file mode 100644 index 0000000..281093c --- /dev/null +++ b/res/xml/wifi_access_points.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + android:title="@string/wifi_settings_category"> + + <com.android.settings.ProgressCategory + android:key="access_points" + android:title="@string/wifi_access_points" + android:persistent="false" /> + + <Preference + android:key="add_other_network" + android:title="@string/wifi_add_other_network" + android:persistent="false" /> + +</PreferenceScreen> diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml index 9101e46..8a76674 100644 --- a/res/xml/wifi_settings.xml +++ b/res/xml/wifi_settings.xml @@ -33,7 +33,7 @@ <com.android.settings.ProgressCategory android:key="access_points" android:dependency="wifi_enabled" - android:title="@string/wifi_access_points" + android:title="@string/wifi_access_points" android:persistent="false" /> <Preference @@ -42,4 +42,4 @@ android:title="@string/wifi_add_other_network" android:persistent="false" /> -</PreferenceScreen> +</PreferenceScreen> |