95b1d7cbbd
This version is to resolve the Reverted CL, ag/13127781 and make NetworkProviderSettingsTest passed Show mobile network on internet page With mobile network - https://screenshot.googleplex.com/7HzGhnbpitErynY Without mobile network - https://screenshot.googleplex.com/8sNVggTpKEhKeRh Class diff: https://diff.googleplex.com/#key=WosyTF0ANVMf Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448 Bug: 173105859 Test: atest NetworkMobileProviderControllerTest passed Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest passed Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest passed Change-Id: Ib0bdd148424881353f18307cb83798b4217060fc
56 lines
2.2 KiB
XML
56 lines
2.2 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">
|
|
|
|
<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="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"/>
|
|
|
|
<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>
|