41f23de712
WifiSettings uses WifiTracker in SettingsLib while WifiSettings2
uses WifiPickerTracker in WifiSettingsLib.
1. Remove WifiSettings.
2. Rename WifiSettings2 to WifiSettings.
3. Remove the files only used in the removed WifiSettings.
(Saved networks files are not included)
Bug: 152571756
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
atest WifiSettingsUiTest
Change-Id: I800b434c8049121db115cff87d51e164e4529999
49 lines
1.9 KiB
XML
49 lines
1.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2010 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"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:title="@string/wifi_settings"
|
|
settings:keywords="@string/keywords_wifi">
|
|
|
|
<com.android.settings.wifi.LinkablePreference
|
|
android:key="wifi_status_message"/>
|
|
|
|
<PreferenceCategory
|
|
android:key="connected_access_point"
|
|
android:layout="@layout/preference_category_no_label"/>
|
|
|
|
<PreferenceCategory
|
|
android:key="access_points"
|
|
android:layout="@layout/preference_category_no_label"/>
|
|
|
|
<Preference
|
|
android:key="configure_wifi_settings"
|
|
android:title="@string/wifi_configure_settings_preference_title"
|
|
settings:allowDividerAbove="true"
|
|
android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>
|
|
|
|
<Preference
|
|
android:key="saved_networks"
|
|
android:title="@string/wifi_saved_access_points_label"
|
|
android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"/>
|
|
|
|
<com.android.settings.datausage.DataUsagePreference
|
|
android:key="wifi_data_usage"
|
|
android:title="@string/wifi_data_usage"/>
|
|
</PreferenceScreen>
|