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

Commit e26cf146 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Provider Model] Fixed Internet Settings always showing "Loading"" into... 

Merge "[Provider Model] Fixed Internet Settings always showing "Loading"" into sc-v2-dev am: 47b212c8

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

Change-Id: I0ce173377bc2be615248fa906359550d605c7a35
parents 0b3b56bc 47b212c8

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -272,8 +272,6 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
        if (mWifiManager != null) {

        if (mWifiManager != null) {

            setLoading(true, false);

            setLoading(true, false);

            mIsViewLoading = true;

            mIsViewLoading = true;

            getView().postDelayed(mRemoveLoadingRunnable,

                    mWifiManager.isWifiEnabled() ? 1000 : 100);

        }

        }

    }

    }
@@ -431,6 +429,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
    @Override

    @Override

    public void onStart() {

    public void onStart() {

        super.onStart();

        super.onStart();

        if (mIsViewLoading) {

            final long delayMillis = mWifiManager.isWifiEnabled() ? 1000 : 100;

            getView().postDelayed(mRemoveLoadingRunnable, delayMillis);

        }

        if (mIsRestricted) {

        if (mIsRestricted) {

            restrictUi();

            restrictUi();

            return;

            return;