Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up deprecated WifiSettings" into main

Browse Source
This commit is contained in:
Chaohui Wang
2023-09-01 10:49:03 +00:00
committed by Android (Google) Code Review
parent 38bb07beb7 6e7b06f18e
commit 83cf8dbadc
11 changed files with 17 additions and 1602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -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(),

7
src/com/android/settings/panel/WifiPanel.java
View File

@@ -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,

4
src/com/android/settings/search/CustomSiteMapRegistry.java
View File

@@ -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());

19
src/com/android/settings/wifi/WifiPickerActivity.java
View File

@@ -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);
}
}

1187
src/com/android/settings/wifi/WifiSettings.java
View File

File diff suppressed because it is too large Load Diff

2
src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
View File

@@ -15,8 +15,8 @@
*/
package com.android.settings.wifi.details;
import static com.android.settings.network.NetworkProviderSettings.WIFI_DIALOG_ID;
import static com.android.settings.network.telephony.MobileNetworkUtils.NO_CELL_DATA_TYPE_ICON;
import static com.android.settings.wifi.WifiSettings.WIFI_DIALOG_ID;
import static com.android.settingslib.Utils.formatPercentage;
import android.app.Dialog;

4
src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
View File

@@ -37,7 +37,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.wifi.WifiSettings;
import com.android.settings.network.NetworkProviderSettings;
import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
import com.android.wifitrackerlib.SavedNetworkTracker;
@@ -127,7 +127,7 @@ public class SavedAccessPointsWifiSettings2 extends DashboardFragment
* Shows {@link WifiNetworkDetailsFragment} for assigned key of {@link WifiEntry}.
*/
public void showWifiPage(@NonNull String key, CharSequence title) {
removeDialog(WifiSettings.WIFI_DIALOG_ID);
removeDialog(NetworkProviderSettings.WIFI_DIALOG_ID);
if (TextUtils.isEmpty(key)) {
Log.e(TAG, "Not able to show WifiEntry of an empty key");