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

Commit ada75fbe authored by Quang Luong's avatar Quang Luong
Browse files

Do not delay updating WifiEntries for first onWifiEntriesUpdated() 

The first callback of onWifiEntriesUpdated() after an onStart() should
update the list of WifiEntries without a delay. The callbacks afterwards
should remain delayed to show the progress bar.

Bug: 187473420
Test: build, visual inspection of entries being updated
Change-Id: Ie11ac156673b261157411e4d6216c454266b51a9
parent f9bde76a

src/com/android/settings/network/NetworkProviderSettings.java

+8 −1
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
        return WifiPickerTracker.isVerboseLoggingEnabled();

    }



    private boolean mIsWifiEntryListStale = true;

    private final Runnable mUpdateWifiEntryPreferencesRunnable = () -> {

        updateWifiEntryPreferences();

    };
@@ -437,6 +438,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 


    @Override

    public void onStop() {

        mIsWifiEntryListStale = true;

        getView().removeCallbacks(mUpdateWifiEntryPreferencesRunnable);

        getView().removeCallbacks(mHideProgressBarRunnable);

        mAirplaneModeEnabler.stop();
@@ -698,7 +700,12 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 


    @Override

    public void onWifiEntriesChanged() {

        if (mIsWifiEntryListStale) {

            mIsWifiEntryListStale = false;

            updateWifiEntryPreferences();

        } else {

            updateWifiEntryPreferencesDelayed();

        }

        changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);



        // Edit the Wi-Fi network of specified SSID.

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

+8 −1
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
        return WifiPickerTracker.isVerboseLoggingEnabled();

    }



    private boolean mIsWifiEntryListStale = true;

    private final Runnable mUpdateWifiEntryPreferencesRunnable = () -> {

        updateWifiEntryPreferences();

    };
@@ -421,6 +422,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
    public void onStop() {

        getView().removeCallbacks(mUpdateWifiEntryPreferencesRunnable);

        getView().removeCallbacks(mHideProgressBarRunnable);

        mIsWifiEntryListStale = true;

        super.onStop();

    }
@@ -678,7 +680,12 @@ public class WifiSettings extends RestrictedSettingsFragment 


    @Override

    public void onWifiEntriesChanged() {

        if (mIsWifiEntryListStale) {

            mIsWifiEntryListStale = false;

            updateWifiEntryPreferences();

        } else {

            updateWifiEntryPreferencesDelayed();

        }

        changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);



        // Edit the Wi-Fi network of specified SSID.