Create configure Wi-Fi screen

Add a gear on Settings menu, and move a bunch of stuff from
overflow and advanced screen to there.  Also move add network
to be the last item in the list rather than in overflow.

Also fix WifiP2p breakage.

Change-Id: I5c84c25e5ba9224f77dcd988b0b2850ae6e71168
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index ed6cfbd..8d9a6cd 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -17,35 +17,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/wifi_advanced_titlebar">
 
-    <!-- android:dependency="enable_wifi" -->
-    <SwitchPreference
-            android:key="notify_open_networks"
-            android:title="@string/wifi_notify_open_networks"
-            android:summary="@string/wifi_notify_open_networks_summary"
-            android:persistent="false" />
-
-    <ListPreference
-            android:key="sleep_policy"
-            android:title="@string/wifi_setting_sleep_policy_title"
-            android:persistent="false"
-            android:entries="@array/wifi_sleep_policy_entries"
-            android:entryValues="@array/wifi_sleep_policy_values" />
-
-    <com.android.settings.AppListSwitchPreference
-            android:key="wifi_assistant"
-            android:title="@string/wifi_automatically_connect_title"
-            android:summary="@string/wifi_automatically_connect_summary"
-            android:dialogTitle="@string/wifi_select_assistant_dialog_title"
-            android:persistent="false" />
-
-    <ListPreference
-            android:key="frequency_band"
-            android:title="@string/wifi_setting_frequency_band_title"
-            android:summary="@string/wifi_setting_frequency_band_summary"
-            android:persistent="false"
-            android:entries="@array/wifi_frequency_band_entries"
-            android:entryValues="@array/wifi_frequency_band_values" />
-
     <Preference
             android:key="install_credentials"
             android:title="@string/wifi_install_credentials"
@@ -66,14 +37,4 @@
             android:title="@string/wifi_menu_wps_pin"
             android:persistent="false" />
 
-    <Preference
-            android:key="mac_address"
-            android:title="@string/wifi_advanced_mac_address_title"
-            android:layout="@layout/wifi_advance_layout" />
-
-    <Preference
-            android:key="current_ip_address"
-            android:title="@string/wifi_advanced_ip_address_title"
-            android:layout="@layout/wifi_advance_layout" />
-
-</PreferenceScreen>   
+</PreferenceScreen>