Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 746176eb authored by Arc Wang's avatar Arc Wang
Browse files

Create NetworkProviderSettings for provider model 

Provider model is a feature which improves networks
Settings UX.

NetworkProviderSettings is the fragment which allow
users to choose a mobile network or a Wi-Fi network
to connect.

At this change, NetworkProviderSettings is a clone
of WifiSettings, mobile networks will be integrated
at later CLs.

Bug: 167474581
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.NetworkProviderSettingsTest
Change-Id: I185639a8f2469e9ec76ad18b6c2bc2e8a4d079e3
parent bcb6d4f4

AndroidManifest.xml

+20 −0
Original line number Diff line number Diff line
@@ -279,6 +279,26 @@ 
                android:value="true" />

        </activity>



        <activity

            android:name="Settings$NetworkProviderSettingsActivity"

            android:label="@string/network_dashboard_title"

            android:icon="@drawable/ic_homepage_network"

            android:exported="true"

            android:configChanges="orientation|keyboardHidden|screenSize">

            <intent-filter android:priority="1">

                <action android:name="android.settings.NETWORK_PROVIDER_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter android:priority="1">

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.network.NetworkProviderSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <activity

            android:name=".wifi.WifiPickerActivity"

            android:exported="true">

res/xml/network_provider_settings.xml

0 → 100644
+48 −0
Original line number Diff line number Diff line 
<?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/network_dashboard_title"

        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>

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ public class Settings extends SettingsActivity { 
    public static class PublicVolumeSettingsActivity extends SettingsActivity { /* empty */ }

    public static class WifiSettingsActivity extends SettingsActivity { /* empty */ }

    public static class WifiSettings2Activity extends SettingsActivity { /* empty */ }

    public static class NetworkProviderSettingsActivity extends SettingsActivity { /* empty */ }

    public static class WifiP2pSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AvailableVirtualKeyboardActivity extends SettingsActivity { /* empty */ }

    public static class KeyboardLayoutPickerActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/core/gateway/SettingsGateway.java

+4 −1
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ import com.android.settings.network.ApnEditor; 
import com.android.settings.network.ApnSettings;

import com.android.settings.network.MobileNetworkListFragment;

import com.android.settings.network.NetworkDashboardFragment;

import com.android.settings.network.NetworkProviderSettings;

import com.android.settings.nfc.AndroidBeam;

import com.android.settings.nfc.PaymentSettings;

import com.android.settings.notification.ConfigureNotificationSettings;
@@ -303,7 +304,8 @@ public class SettingsGateway { 
            GestureNavigationSettingsFragment.class.getName(),

            InteractAcrossProfilesSettings.class.getName(),

            InteractAcrossProfilesDetails.class.getName(),

            MediaControlsSettings.class.getName()

            MediaControlsSettings.class.getName(),

            NetworkProviderSettings.class.getName()

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {
@@ -324,6 +326,7 @@ public class SettingsGateway { 
            // Home page > Network & Internet

            Settings.WifiSettingsActivity.class.getName(),

            Settings.DataUsageSummaryActivity.class.getName(),

            Settings.NetworkProviderSettingsActivity.class.getName(),

            // Home page > Connected devices

            Settings.BluetoothSettingsActivity.class.getName(),

            Settings.WifiDisplaySettingsActivity.class.getName(),

src/com/android/settings/network/NetworkProviderSettings.java

0 → 100644
+1149 −0

File added.

Preview size limit exceeded, changes collapsed.