Merge "Add a loading progress timeout mechanism to Internet Settings" into sc-dev am: 0781c52dfe

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

Change-Id: I51b498f5ecddff016dc8442fff60f6a0dd4b42a2

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

@@ -267,9 +267,8 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
         if (mWifiManager != null) {
             setLoading(true, false);
             mIsViewLoading = true;
-            if (!mWifiManager.isWifiEnabled()) {
-                getView().postDelayed(mRemoveLoadingRunnable, 100);
-            }
+            getView().postDelayed(mRemoveLoadingRunnable,
+                    mWifiManager.isWifiEnabled() ? 1000 : 100);
         }
     }