commit b1d19a8b35597afcdceca47ead5c059fea7f2c9a
author Zhen Zhang <zzhen@google.com> Wed Mar 25 13:33:45 2020 -0700
committer Zhen Zhang <zzhen@google.com> Mon Apr 06 19:14:41 2020 +0000
tree f0aaba04bc489cadf72e949e12a7826e4bdbc483
parent df338dd65202a3d421e06251ae8477eb5e4de8b0

Fix advanced preferences behavior in AllInOneTetherSettings

In AllInOneTetherSettings, advanced preferences should not be hidden
again after user have expanded them.

Bug: 151954343
Test: CodeInspectionTest; AllInOneTetherSettingsTest; manually test oberved advanced preferences won't be hidden.
Change-Id: If2c7d99b7dcac4149f065eca73022a582924c90b

src/com/android/settings/AllInOneTetherSettings.java

diff --git a/src/com/android/settings/AllInOneTetherSettings.java b/src/com/android/settings/AllInOneTetherSettings.java
index c562fae..22453a3 100644
--- a/src/com/android/settings/AllInOneTetherSettings.java
+++ b/src/com/android/settings/AllInOneTetherSettings.java
@@ -91,8 +91,12 @@
 
     private static final String KEY_DATA_SAVER_FOOTER = "disabled_on_data_saver" + DEDUP_POSTFIX;
     private static final String KEY_WIFI_TETHER_GROUP = "wifi_tether_settings_group";
-    private static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 2;
-    private static final int EXPANDED_CHILD_COUNT_DEFAULT = 3;
+    @VisibleForTesting
+    static final int EXPANDED_CHILD_COUNT_DEFAULT = 3;
+    @VisibleForTesting
+    static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 2;
+    @VisibleForTesting
+    static final int EXPANDED_CHILD_COUNT_WITHOUT_WIFI_CONFIG = 3;
     private static final String TAG = "AllInOneTetherSettings";
 
     private boolean mUnavailable;
@@ -120,7 +124,6 @@
                 mUsbTethering = TetherEnabler.isUsbTethering(state);
                 mWifiTethering = TetherEnabler.isWifiTethering(state);
                 mWifiTetherGroup.setVisible(shouldShowWifiConfig());
-                reConfigInitialExpandedChildCount();
             };
 
     private final BroadcastReceiver mTetherChangeReceiver = new BroadcastReceiver() {
@@ -354,10 +357,6 @@
             mRestartWifiApAfterConfigChange = true;
             mTetherEnabler.stopTethering(TETHERING_WIFI);
         }
-
-        if (controller instanceof WifiTetherSecurityPreferenceController) {
-            reConfigInitialExpandedChildCount();
-        }
     }
 
     private SoftApConfiguration buildNewConfig() {
@@ -384,15 +383,10 @@
         return mWifiTethering || (!mBluetoothTethering && !mUsbTethering);
     }
 
-    private void reConfigInitialExpandedChildCount() {
-        getPreferenceScreen().setInitialExpandedChildrenCount(getInitialExpandedChildCount());
-    }
-
     @Override
     public int getInitialExpandedChildCount() {
         if (!shouldShowWifiConfig()) {
-            // Expand all preferences in the screen.
-            return getPreferenceScreen().getPreferenceCount();
+            return EXPANDED_CHILD_COUNT_WITHOUT_WIFI_CONFIG;
         }
 
         if (mSecurityPreferenceController == null) {