Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42fe8e4d authored by Betty Chang's avatar Betty Chang Committed by Automerger Merge Worker
Browse files

Merge "Remove the Advanced item when Security type is open" into sc-v2-dev am: 54abe8fa 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091077

Change-Id: I738cf43b802c21afc59d3ca277b8b690ab8e0877
parents 260365b0 54abe8fa

src/com/android/settings/wifi/tether/WifiTetherSettings.java

+0 −12
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 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_DEFAULT = 3;



    @VisibleForTesting

    static final String KEY_WIFI_TETHER_NETWORK_NAME = "wifi_tether_network_name";
@@ -204,10 +203,6 @@ public class WifiTetherSettings extends RestrictedDashboardFragment 
            mSwitchBarController.stopTether();

        }

        mWifiManager.setSoftApConfiguration(config);



        if (context instanceof WifiTetherSecurityPreferenceController) {

            reConfigInitialExpandedChildCount();

        }

    }



    private SoftApConfiguration buildNewConfig() {
@@ -287,11 +282,4 @@ public class WifiTetherSettings extends RestrictedDashboardFragment 
            }

        }

    }



    private void reConfigInitialExpandedChildCount() {

        final PreferenceGroup screen = getPreferenceScreen();

        if (screen != null) {

            screen.setInitialExpandedChildrenCount(getInitialExpandedChildCount());

        }

    }

}