Merge "[Wi-Fi] Expose AP Band outside of the Advanced section" into rvc-dev
diff --git a/res/xml/all_tether_prefs.xml b/res/xml/all_tether_prefs.xml
index 84d5d2a..0aee621 100644
--- a/res/xml/all_tether_prefs.xml
+++ b/res/xml/all_tether_prefs.xml
@@ -42,15 +42,15 @@
android:summary="@string/wifi_hotspot_auto_off_summary"/>
<ListPreference
+ android:key="wifi_tether_network_ap_band_2"
+ android:title="@string/wifi_hotspot_ap_band_title"/>
+
+ <ListPreference
android:key="wifi_tether_security_2"
android:title="@string/wifi_security"
android:summary="@string/summary_placeholder"
android:entries="@array/wifi_tether_security"
android:entryValues="@array/wifi_tether_security_values"/>
-
- <ListPreference
- android:key="wifi_tether_network_ap_band_2"
- android:title="@string/wifi_hotspot_ap_band_title"/>
</PreferenceCategory>
<PreferenceCategory
diff --git a/res/xml/wifi_tether_settings.xml b/res/xml/wifi_tether_settings.xml
index 1f43bb5..34d8032 100644
--- a/res/xml/wifi_tether_settings.xml
+++ b/res/xml/wifi_tether_settings.xml
@@ -37,12 +37,12 @@
android:persistent="false"
android:title="@string/wifi_hotspot_password_title"/>
+ <ListPreference
+ android:key="wifi_tether_network_ap_band"
+ android:title="@string/wifi_hotspot_ap_band_title"/>
+
<SwitchPreference
android:key="wifi_tether_auto_turn_off"
android:title="@string/wifi_hotspot_auto_off_title"
android:summary="@string/wifi_hotspot_auto_off_summary"/>
-
- <ListPreference
- android:key="wifi_tether_network_ap_band"
- android:title="@string/wifi_hotspot_ap_band_title"/>
</PreferenceScreen>
diff --git a/src/com/android/settings/AllInOneTetherSettings.java b/src/com/android/settings/AllInOneTetherSettings.java
index 1cf68a0..ed3b5b0 100644
--- a/src/com/android/settings/AllInOneTetherSettings.java
+++ b/src/com/android/settings/AllInOneTetherSettings.java
@@ -98,9 +98,9 @@
public static final String ETHERNET_TETHER_KEY = "enable_ethernet_tethering" + DEDUP_POSTFIX;
@VisibleForTesting
- static final int EXPANDED_CHILD_COUNT_DEFAULT = 3;
+ static final int EXPANDED_CHILD_COUNT_DEFAULT = 4;
@VisibleForTesting
- static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 2;
+ static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 3;
@VisibleForTesting
static final int EXPANDED_CHILD_COUNT_MAX = Integer.MAX_VALUE;
private static final String TAG = "AllInOneTetherSettings";
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index 3160609..9e68202 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -54,8 +54,8 @@
private static final String TAG = "WifiTetherSettings";
private static final IntentFilter TETHER_STATE_CHANGE_FILTER;
private static final String KEY_WIFI_TETHER_SCREEN = "wifi_tether_settings_screen";
- private static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 2;
- private static final int EXPANDED_CHILD_COUNT_DEFAULT = 3;
+ private static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 3;
+ private static final int EXPANDED_CHILD_COUNT_DEFAULT = 4;
@VisibleForTesting
static final String KEY_WIFI_TETHER_NETWORK_NAME = "wifi_tether_network_name";