PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Misc fix on network & internet screen for developer preview"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-07 21:34:16 +00:00
committed by Android (Google) Code Review
parent 249077a0cd 56199e9487
commit 14c2050330
13 changed files with 280 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/ConfigureWifiSettings.java
View File

@@ -25,6 +25,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.network.WifiCallingPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.wifi.p2p.WifiP2pPreferenceController;
@@ -71,6 +72,7 @@ public class ConfigureWifiSettings extends DashboardFragment {
controllers.add(new WifiWakeupPreferenceController(context, getLifecycle()));
controllers.add(new WifiSleepPolicyPreferenceController(context));
controllers.add(new WifiP2pPreferenceController(context, getLifecycle(), mWifiManager));
controllers.add(new WifiCallingPreferenceController(context));
controllers.add(new WpsPreferenceController(
context, getLifecycle(), mWifiManager, getFragmentManager()));
return controllers;