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

res/xml/network_and_internet.xml

@@ -26,8 +26,8 @@
         android:icon="@drawable/ic_settings_wireless"
         android:order="-30">
         <intent
-          android:action="android.settings.WIFI_SETTINGS"
-          android:targetClass="Settings$WifiSettingsActivity" />
+            android:action="android.settings.WIFI_SETTINGS"
+            android:targetClass="Settings$WifiSettingsActivity"/>
     </com.android.settings.widget.MasterSwitchPreference>
 
     <SwitchPreference
@@ -77,24 +77,9 @@
         settings:userRestriction="no_config_mobile_networks"
         settings:useAdminDisabledSummary="true"/>
 
-    <Preference
-        android:key="wifi_calling_settings"
-        android:title="@string/wifi_calling_settings_title"
-        android:fragment="com.android.settings.WifiCallingSettings"
-        settings:keywords="@string/keywords_wifi_calling"/>
-
     <Preference
         android:fragment="com.android.settings.ProxySelector"
         android:key="proxy_settings"
         android:title="@string/proxy_settings_title"/>
 
-    <!-- Network reset -->
-    <com.android.settingslib.RestrictedPreference
-        android:key="network_reset"
-        android:title="@string/reset_network_title"
-        android:icon="@drawable/ic_settings_backup_restore"
-        settings:keywords="@string/keywords_network_reset"
-        android:fragment="com.android.settings.ResetNetwork"
-        settings:userRestriction="no_network_reset"
-        settings:useAdminDisabledSummary="true"/>
 </PreferenceScreen>

res/xml/wifi_configure_settings.xml

@@ -14,8 +14,10 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/wifi_configure_titlebar">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/wifi_configure_titlebar">
 
     <SwitchPreference
             android:key="enable_wifi_wakeup"
@@ -53,6 +55,12 @@
         </intent>
     </Preference>
 
+    <Preference
+        android:key="wifi_calling_settings"
+        android:title="@string/wifi_calling_settings_title"
+        android:fragment="com.android.settings.WifiCallingSettings"
+        settings:keywords="@string/keywords_wifi_calling"/>
+
     <Preference
             android:key="wifi_direct"
             android:title="@string/wifi_menu_p2p">