edebd02b0a
- Network & internet Settings
- Remove “Show airplane mode networks"
- Internet Settings
- Add “Wi-Fi” switch preference
- Show “Find and connect to Wi-Fi networks” in summary
- Screenshot:
https://screenshot.googleplex.com/AnoXf4qDe2jPirP
Bug: 181858434
Test: manual test
atest -c NetworkDashboardFragmentTest \
WifiSwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Ic420ff40cfdfb3ae29ee6f754ce139cb54651bda
82 lines
3.3 KiB
XML
82 lines
3.3 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2020 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/provider_internet_settings"
|
|
settings:keywords="@string/keywords_wifi">
|
|
|
|
<!-- Resetting your internet description -->
|
|
<com.android.settingslib.widget.LayoutPreference
|
|
android:key="resetting_your_internet"
|
|
android:title="@string/resetting_internet_text"
|
|
android:selectable="false"
|
|
android:layout="@layout/resetting_internet"
|
|
settings:allowDividerBelow="true"/>
|
|
|
|
<!-- View airplane mode networks button -->
|
|
<com.android.settingslib.widget.LayoutPreference
|
|
android:key="view_airplane_mode_netwokrs_button"
|
|
android:title="@string/condition_airplane_title"
|
|
android:selectable="false"
|
|
android:layout="@layout/view_airplane_mode_networks_button"
|
|
settings:allowDividerBelow="true"/>
|
|
|
|
<Preference
|
|
android:key="connected_ethernet_network"
|
|
android:title="@string/ethernet"
|
|
android:summary="@string/to_switch_networks_disconnect_ethernet"
|
|
android:icon="@drawable/ic_settings_ethernet"/>
|
|
|
|
<PreferenceCategory
|
|
android:key="connected_access_point"
|
|
android:layout="@layout/preference_category_no_label"/>
|
|
|
|
<PreferenceCategory
|
|
android:key="provider_model_mobile_network"
|
|
android:title="@string/summary_placeholder"
|
|
android:layout="@layout/preference_category_no_label"
|
|
settings:controller="com.android.settings.network.NetworkMobileProviderController"/>
|
|
|
|
<PreferenceCategory
|
|
android:key="access_points"
|
|
android:layout="@layout/preference_category_no_label"/>
|
|
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="wifi_switch"
|
|
android:title="@string/wifi"
|
|
android:summary="@string/wifi_switch_summary"
|
|
settings:allowDividerAbove="true"
|
|
settings:keywords="@string/keywords_wifi"/>
|
|
|
|
<Preference
|
|
android:key="configure_wifi_settings"
|
|
android:title="@string/network_and_internet_preferences_title"
|
|
android:summary="@string/network_and_internet_preferences_summary"
|
|
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="non_carrier_data_usage"
|
|
android:title="@string/non_carrier_data_usage"/>
|
|
</PreferenceScreen>
|