Settings Fragment Migration (Build pass app)
This patch focused on fixing compile errors and some runtime errors. Test: We can't test it now. But we will have an integration test later. Bug: 110259478 Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
This commit is contained in:
@@ -76,15 +76,18 @@ public class ConfigureWifiSettings extends DashboardFragment {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
mWifiWakeupPreferenceController = new WifiWakeupPreferenceController(context, this);
|
||||
mUseOpenWifiPreferenceController = new UseOpenWifiPreferenceController(context, this,
|
||||
getLifecycle());
|
||||
getSettingsLifecycle());
|
||||
final WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
controllers.add(mWifiWakeupPreferenceController);
|
||||
controllers.add(new NotifyOpenNetworksPreferenceController(context, getLifecycle()));
|
||||
controllers.add(new NotifyOpenNetworksPreferenceController(context,
|
||||
getSettingsLifecycle()));
|
||||
controllers.add(mUseOpenWifiPreferenceController);
|
||||
controllers.add(new WifiInfoPreferenceController(context, getLifecycle(), wifiManager));
|
||||
controllers.add(new WifiInfoPreferenceController(context, getSettingsLifecycle(),
|
||||
wifiManager));
|
||||
controllers.add(new CellularFallbackPreferenceController(context));
|
||||
controllers.add(new WifiP2pPreferenceController(context, getLifecycle(), wifiManager));
|
||||
controllers.add(new WifiP2pPreferenceController(context, getSettingsLifecycle(),
|
||||
wifiManager));
|
||||
return controllers;
|
||||
}
|
||||
|
||||
|
@@ -22,6 +22,8 @@ import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.wifi.p2p.WifiP2pSettings;
|
||||
|
||||
import androidx.preference.PreferenceFragmentCompat;
|
||||
|
||||
public class WifiPickerActivity extends SettingsActivity implements ButtonBarHandler {
|
||||
|
||||
@Override
|
||||
@@ -44,7 +46,7 @@ public class WifiPickerActivity extends SettingsActivity implements ButtonBarHan
|
||||
return false;
|
||||
}
|
||||
|
||||
/* package */ Class<? extends PreferenceFragment> getWifiSettingsClass() {
|
||||
/* package */ Class<? extends PreferenceFragmentCompat> getWifiSettingsClass() {
|
||||
return WifiSettings.class;
|
||||
}
|
||||
}
|
||||
|
@@ -16,7 +16,6 @@
|
||||
|
||||
package com.android.settings.wifi;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
import android.content.DialogInterface;
|
||||
@@ -32,11 +31,12 @@ import com.android.settings.R;
|
||||
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
|
||||
/**
|
||||
* This activity requests users permission to allow scanning even when Wi-Fi is turned off
|
||||
*/
|
||||
public class WifiScanModeActivity extends Activity {
|
||||
public class WifiScanModeActivity extends FragmentActivity {
|
||||
private DialogFragment mDialog;
|
||||
private String mApp;
|
||||
|
||||
@@ -67,7 +67,7 @@ public class WifiScanModeActivity extends Activity {
|
||||
private void createDialog() {
|
||||
if (mDialog == null) {
|
||||
mDialog = AlertDialogFragment.newInstance(mApp);
|
||||
mDialog.show(getFragmentManager(), "dialog");
|
||||
mDialog.show(getSupportFragmentManager(), "dialog");
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -243,7 +243,7 @@ public class WifiSettings extends RestrictedSettingsFragment
|
||||
super.onActivityCreated(savedInstanceState);
|
||||
|
||||
mWifiTracker = WifiTrackerFactory.create(
|
||||
getActivity(), this, getLifecycle(), true, true);
|
||||
getActivity(), this, getSettingsLifecycle(), true, true);
|
||||
mWifiManager = mWifiTracker.getManager();
|
||||
|
||||
final Activity activity = getActivity();
|
||||
|
@@ -38,7 +38,7 @@ import java.util.List;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.legacy.app.FragmentPagerAdapter;
|
||||
import androidx.fragment.app.FragmentPagerAdapter;
|
||||
|
||||
/**
|
||||
* "Wi-Fi Calling settings" screen. This is the container fragment which holds
|
||||
|
@@ -128,7 +128,7 @@ public class WifiNetworkDetailsFragment extends DashboardFragment {
|
||||
context,
|
||||
this,
|
||||
new Handler(Looper.getMainLooper()), // UI thread.
|
||||
getLifecycle(),
|
||||
getSettingsLifecycle(),
|
||||
context.getSystemService(WifiManager.class),
|
||||
mMetricsFeatureProvider);
|
||||
|
||||
|
@@ -110,7 +110,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
|
||||
final SwitchBar switchBar = activity.getSwitchBar();
|
||||
mSwitchBarController = new WifiTetherSwitchBarController(activity,
|
||||
new SwitchBarController(switchBar));
|
||||
getLifecycle().addObserver(mSwitchBarController);
|
||||
getSettingsLifecycle().addObserver(mSwitchBarController);
|
||||
switchBar.show();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user