From b347128bbff604b906caa10c3954876383609070 Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Mon, 18 May 2020 11:13:47 +0800
Subject: [PATCH] [Wi-Fi] Expose AP Band outside of the Advanced section

Design change for UX improvement.

Bug: 156629343
Test: manual visual
Change-Id: I4ff89eec472de699d1fa723d8369ad99b78a83a3
---
 res/xml/all_tether_prefs.xml                              | 8 ++++----
 res/xml/wifi_tether_settings.xml                          | 8 ++++----
 src/com/android/settings/AllInOneTetherSettings.java      | 4 ++--
 .../android/settings/wifi/tether/WifiTetherSettings.java  | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/res/xml/all_tether_prefs.xml b/res/xml/all_tether_prefs.xml
index 84d5d2ac173..0aee621b7f7 100644
--- a/res/xml/all_tether_prefs.xml
+++ b/res/xml/all_tether_prefs.xml
@@ -41,16 +41,16 @@
             android:title="@string/wifi_hotspot_auto_off_title"
             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 1f43bb54542..34d8032cbb9 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 1cf68a0a227..ed3b5b071c6 100644
--- a/src/com/android/settings/AllInOneTetherSettings.java
+++ b/src/com/android/settings/AllInOneTetherSettings.java
@@ -98,9 +98,9 @@ public class AllInOneTetherSettings extends RestrictedDashboardFragment
     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 316060996a1..9e682021a00 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -54,8 +54,8 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
     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";