Migrate more settings to use SubSettingsLauncher
Bug: 73250851 Test: robotests Change-Id: I08f6f380489646231d6d8ceb1488e2efb036bf69
This commit is contained in:
@@ -30,7 +30,6 @@ import android.net.NetworkInfo;
|
||||
import android.net.NetworkInfo.State;
|
||||
import android.net.wifi.WifiConfiguration;
|
||||
import android.net.wifi.WifiManager;
|
||||
import android.net.wifi.WpsInfo;
|
||||
import android.nfc.NfcAdapter;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
@@ -52,6 +51,7 @@ import com.android.settings.LinkifyUtils;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.RestrictedSettingsFragment;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.core.SubSettingLauncher;
|
||||
import com.android.settings.dashboard.SummaryLoader;
|
||||
import com.android.settings.location.ScanningSettings;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
@@ -861,10 +861,12 @@ public class WifiSettings extends RestrictedSettingsFragment
|
||||
pref.setOnPreferenceClickListener(preference -> {
|
||||
pref.getAccessPoint().saveWifiState(pref.getExtras());
|
||||
|
||||
SettingsActivity activity = (SettingsActivity) WifiSettings.this.getActivity();
|
||||
activity.startPreferencePanel(this,
|
||||
WifiNetworkDetailsFragment.class.getName(), pref.getExtras(),
|
||||
-1 /* resId */, pref.getTitle(), null, 0 /* resultRequestCode */);
|
||||
new SubSettingLauncher(getContext())
|
||||
.setTitle(pref.getTitle())
|
||||
.setDestination(WifiNetworkDetailsFragment.class.getName())
|
||||
.setArguments(pref.getExtras())
|
||||
.setSourceMetricsCategory(getMetricsCategory())
|
||||
.launch();
|
||||
return true;
|
||||
});
|
||||
|
||||
@@ -922,15 +924,12 @@ public class WifiSettings extends RestrictedSettingsFragment
|
||||
Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1;
|
||||
final CharSequence description = wifiScanningMode ? getText(R.string.wifi_scan_notify_text)
|
||||
: getText(R.string.wifi_scan_notify_text_scanning_off);
|
||||
final LinkifyUtils.OnClickListener clickListener = new LinkifyUtils.OnClickListener() {
|
||||
@Override
|
||||
public void onClick() {
|
||||
final SettingsActivity activity = (SettingsActivity) getActivity();
|
||||
activity.startPreferencePanel(WifiSettings.this,
|
||||
ScanningSettings.class.getName(),
|
||||
null, R.string.location_scanning_screen_title, null, null, 0);
|
||||
}
|
||||
};
|
||||
final LinkifyUtils.OnClickListener clickListener =
|
||||
() -> new SubSettingLauncher(getContext())
|
||||
.setDestination(ScanningSettings.class.getName())
|
||||
.setTitle(R.string.location_scanning_screen_title)
|
||||
.setSourceMetricsCategory(getMetricsCategory())
|
||||
.launch();
|
||||
mStatusMessagePreference.setText(title, description, clickListener);
|
||||
removeConnectedAccessPointPreference();
|
||||
mAccessPointsPreferenceCategory.removeAll();
|
||||
|
||||
Reference in New Issue
Block a user