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

Commit 6e7b06f1 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Clean up deprecated WifiSettings 

Replace all references to NetworkProviderSettings.

Bug: 297036035
Test: robo test
Test: manual - on internet settings
Change-Id: I2a5ae5644042c982c2a284a303257896c20b7714
parent ca4e47c3

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

+0 −2
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ import com.android.settings.wfd.WifiDisplaySettings; 
import com.android.settings.wifi.ConfigureWifiSettings;

import com.android.settings.wifi.WifiAPITest;

import com.android.settings.wifi.WifiInfo;

import com.android.settings.wifi.WifiSettings;

import com.android.settings.wifi.calling.WifiCallingDisclaimerFragment;

import com.android.settings.wifi.calling.WifiCallingSettings;

import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
@@ -203,7 +202,6 @@ public class SettingsGateway { 
            AdvancedConnectedDeviceDashboardFragment.class.getName(),

            CreateShortcut.class.getName(),

            BluetoothPairingDetail.class.getName(),

            WifiSettings.class.getName(),

            WifiNetworkDetailsFragment.class.getName(),

            ConfigureWifiSettings.class.getName(),

            SavedAccessPointsWifiSettings2.class.getName(),

src/com/android/settings/panel/WifiPanel.java

+3 −4
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ import android.net.Uri; 


import com.android.settings.R;

import com.android.settings.SubSettings;

import com.android.settings.network.NetworkProviderSettings;

import com.android.settings.slices.CustomSliceRegistry;

import com.android.settings.slices.SliceBuilderUtils;

import com.android.settings.wifi.WifiSettings;



import java.util.ArrayList;

import java.util.List;
@@ -59,10 +59,9 @@ public class WifiPanel implements PanelContent { 


    @Override

    public Intent getSeeMoreIntent() {

        final String screenTitle =

                mContext.getText(R.string.wifi_settings).toString();

        final String screenTitle = mContext.getText(R.string.wifi_settings).toString();

        final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,

                WifiSettings.class.getName(),

                NetworkProviderSettings.class.getName(),

                null /* key */,

                screenTitle,

                SettingsEnums.WIFI,

src/com/android/settings/search/CustomSiteMapRegistry.java

+0 −4
Original line number Diff line number Diff line
@@ -27,13 +27,11 @@ import com.android.settings.gestures.GestureNavigationSettingsFragment; 
import com.android.settings.gestures.SystemNavigationGestureSettings;

import com.android.settings.location.LocationSettings;

import com.android.settings.location.RecentLocationAccessSeeAllFragment;

import com.android.settings.network.NetworkDashboardFragment;

import com.android.settings.notification.zen.ZenModeBlockedEffectsSettings;

import com.android.settings.notification.zen.ZenModeRestrictNotificationsSettings;

import com.android.settings.security.SecuritySettings;

import com.android.settings.security.screenlock.ScreenLockSettings;

import com.android.settings.system.SystemDashboardFragment;

import com.android.settings.wifi.WifiSettings;



import java.util.Map;
@@ -50,8 +48,6 @@ public class CustomSiteMapRegistry { 
    static {

        CUSTOM_SITE_MAP = new ArrayMap<>();

        CUSTOM_SITE_MAP.put(ScreenLockSettings.class.getName(), SecuritySettings.class.getName());

        CUSTOM_SITE_MAP.put(

                WifiSettings.class.getName(), NetworkDashboardFragment.class.getName());

        CUSTOM_SITE_MAP.put(PowerUsageAdvanced.class.getName(), PowerUsageSummary.class.getName());

        CUSTOM_SITE_MAP.put(RecentLocationAccessSeeAllFragment.class.getName(),

                LocationSettings.class.getName());

src/com/android/settings/wifi/WifiPickerActivity.java

+4 −15
Original line number Diff line number Diff line
@@ -17,11 +17,10 @@ package com.android.settings.wifi; 


import android.content.Intent;



import androidx.preference.PreferenceFragmentCompat;



import com.android.settings.ButtonBarHandler;

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.network.NetworkProviderSettings;

import com.android.settings.wifi.p2p.WifiP2pSettings;

import com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2;
@@ -31,7 +30,7 @@ public class WifiPickerActivity extends SettingsActivity implements ButtonBarHan 
    public Intent getIntent() {

        Intent modIntent = new Intent(super.getIntent());

        if (!modIntent.hasExtra(EXTRA_SHOW_FRAGMENT)) {

            modIntent.putExtra(EXTRA_SHOW_FRAGMENT, getWifiSettingsClass().getName());

            modIntent.putExtra(EXTRA_SHOW_FRAGMENT, NetworkProviderSettings.class.getName());

            modIntent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.wifi_select_network);

        }

        return modIntent;
@@ -39,18 +38,8 @@ public class WifiPickerActivity extends SettingsActivity implements ButtonBarHan 


    @Override

    protected boolean isValidFragment(String fragmentName) {

        final boolean isSavedAccessPointsWifiSettings =

                SavedAccessPointsWifiSettings2.class.getName().equals(fragmentName);



        if (WifiSettings.class.getName().equals(fragmentName)

        return NetworkProviderSettings.class.getName().equals(fragmentName)

                || WifiP2pSettings.class.getName().equals(fragmentName)

                || isSavedAccessPointsWifiSettings) {

            return true;

        }

        return false;

    }



    /* package */ Class<? extends PreferenceFragmentCompat> getWifiSettingsClass() {

        return WifiSettings.class;

                || SavedAccessPointsWifiSettings2.class.getName().equals(fragmentName);

    }

}

src/com/android/settings/wifi/WifiSettings.java

deleted100644 → 0
+0 −1187

File deleted.

Preview size limit exceeded, changes collapsed.