Move the definition from Java to XML, so that SearchIndexProvider can include it in the getXmlResourcesToIndex(). Also update getNonIndexableKeys() to return the corresponding key when the preference is hidden. If the Internet settings are restricted, "Add network" still appears on search. When clicked, it opens the Internet settings page in restricted mode, so that users can know that the settings are restricted. Bug: 224421762 Fix: 224421762 Test: atest SettingsRoboTests:NetworkProviderSettingsTest Change-Id: Ie9ea58070843a390844b461ce766f0ce29e64fab
97 lines
3.8 KiB
XML
97 lines
3.8 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"/>
|
|
|
|
<!-- Airplane mode message -->
|
|
<com.android.settingslib.widget.LayoutPreference
|
|
android:key="airplane_mode_message"
|
|
android:title="@string/condition_airplane_title"
|
|
android:selectable="false"
|
|
android:layout="@layout/airplane_mode_message_preference"
|
|
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="provider_model_mobile_network"
|
|
android:title="@string/summary_placeholder"
|
|
android:layout="@layout/preference_category_no_label"
|
|
settings:isPreferenceVisible="@bool/config_show_sim_info"
|
|
settings:controller="com.android.settings.network.NetworkMobileProviderController"/>
|
|
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="main_toggle_wifi"
|
|
android:title="@string/wifi"
|
|
settings:keywords="@string/keywords_wifi"
|
|
settings:allowDividerAbove="true"/>
|
|
|
|
<PreferenceCategory
|
|
android:key="connected_access_point"
|
|
android:layout="@layout/preference_category_no_label"/>
|
|
|
|
<PreferenceCategory
|
|
android:key="first_access_points"
|
|
android:layout="@layout/preference_category_no_label"/>
|
|
|
|
<PreferenceCategory
|
|
android:key="access_points"
|
|
android:layout="@layout/preference_category_no_label">
|
|
|
|
<com.android.settings.wifi.AddWifiNetworkPreference
|
|
android:key="add_wifi_network"
|
|
android:title="@string/wifi_add_network"
|
|
android:icon="@drawable/ic_add_24dp"/>
|
|
</PreferenceCategory>
|
|
|
|
<Preference
|
|
android:key="configure_network_settings"
|
|
android:title="@string/network_and_internet_preferences_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="non_carrier_data_usage"
|
|
android:title="@string/non_carrier_data_usage"/>
|
|
|
|
<com.android.settingslib.widget.FooterPreference
|
|
android:key="wifi_status_message_footer"
|
|
android:selectable="false"
|
|
settings:allowDividerAbove="false"
|
|
settings:searchable="false"/>
|
|
</PreferenceScreen>
|