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

Commit a7666965 authored by Arc Wang's avatar Arc Wang
Browse files

[Wi-Fi] Wi-Fi picker scrolls to top after a user clicked to connect 

After a connect success callback, Wi-Fi picker scrolls to the connected
Wi-Fi network after it's added in.

Bug: 152576795
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2
      manual
      Click a Wi-Fi network or it's context menu 'Connect' button
      to connect and see if  UI scroll to the top.
Change-Id: Ia96af86c9ed552324089f97db104975e28f6c1c7
parent 3bb38080

src/com/android/settings/wifi/WifiSettings2.java

+10 −2
Original line number Diff line number Diff line
@@ -647,6 +647,7 @@ public class WifiSettings2 extends RestrictedSettingsFragment 
                setOffMessage();

                setAdditionalSettingsSummaries();

                setProgressBarVisible(false);

                mClickedConnect = false;

                break;

        }

    }
@@ -739,6 +740,11 @@ public class WifiSettings2 extends RestrictedSettingsFragment 
                pref.setOnGearClickListener(preference -> {

                    launchNetworkDetailsFragment(pref);

                });



                if (mClickedConnect) {

                    mClickedConnect = false;

                    scrollToPreference(mConnectedWifiEntryPreferenceCategory);

                }

            }

        } else {

            mConnectedWifiEntryPreferenceCategory.removeAll();
@@ -1007,7 +1013,7 @@ public class WifiSettings2 extends RestrictedSettingsFragment 
    private class WifiConnectActionListener implements WifiManager.ActionListener {

        @Override

        public void onSuccess() {

            // Do nothing.

            mClickedConnect = true;

        }



        @Override
@@ -1041,7 +1047,9 @@ public class WifiSettings2 extends RestrictedSettingsFragment 
                return;

            }



            if (status == ConnectCallback.CONNECT_STATUS_FAILURE_NO_CONFIG) {

            if (status == ConnectCallback.CONNECT_STATUS_SUCCESS) {

                mClickedConnect = true;

            } else if (status == ConnectCallback.CONNECT_STATUS_FAILURE_NO_CONFIG) {

                if (mEditIfNoConfig) {

                    // Edit an unsaved secure Wi-Fi network.

                    if (mFullScreenEdit) {