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

Move AdvancedWifiSettings into ConfigureWifiSettings.

Browse Source 
Bug:34719854
Test: make -j40 RunSettingsRoboTests
clicked on preferences and made sure functionality did not change.

Change-Id: Ia5f0c7f5ea0f88d1322008ab58ca79028cc1a2bb
This commit is contained in:
Stephen Chen
2017-01-25 17:34:09 -08:00
parent 5d1506a2af
commit 9d2712cd78
16 changed files with 540 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,8 @@
*/
package com.android.settings.wifi;
import static android.content.Context.WIFI_SERVICE;
import android.content.Context;
import android.net.wifi.WifiManager;
import android.provider.SearchIndexableResource;
@@ -25,13 +27,12 @@ import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.wifi.p2p.WifiP2pPreferenceController;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static android.content.Context.WIFI_SERVICE;
public class ConfigureWifiSettings extends DashboardFragment {
private static final String TAG = "ConfigureWifiSettings";
@@ -63,6 +64,9 @@ public class ConfigureWifiSettings extends DashboardFragment {
controllers.add(new NotifyOpenNetworksPreferenceController(context, getLifecycle()));
controllers.add(new WifiWakeupPreferenceController(context, getLifecycle()));
controllers.add(new WifiSleepPolicyPreferenceController(context));
controllers.add(new WifiP2pPreferenceController(context, getLifecycle(), mWifiManager));
controllers.add(new WpsPreferenceController(
context, getLifecycle(), mWifiManager, getFragmentManager()));
return controllers;
}