From 69a80b3f9820de9a4bc9cd47664369799729a32b Mon Sep 17 00:00:00 2001
From: Weng Su <wengsu@google.com>
Date: Fri, 11 Jun 2021 22:50:24 +0800
Subject: [PATCH] Add loading progress to Internet Settings

Bug: 173207801
Bug: 190696245
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I8693fb3e1fb236ce1442da2ab12b189786606266
---
 .../android/settings/network/NetworkProviderSettings.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index 22b9bccc52f..9942ca3c60f 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -169,9 +169,14 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
         return WifiPickerTracker.isVerboseLoggingEnabled();
     }
 
+    private boolean mIsWifiEntriesLoading;
     private boolean mIsWifiEntryListStale = true;
     private final Runnable mUpdateWifiEntryPreferencesRunnable = () -> {
         updateWifiEntryPreferences();
+        if (mIsWifiEntriesLoading) {
+            setLoading(false, false);
+            mIsWifiEntriesLoading = false;
+        }
     };
     private final Runnable mHideProgressBarRunnable = () -> {
         setProgressBarVisible(false);
@@ -251,6 +256,8 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
                     .findViewById(R.id.progress_bar_animation);
             setProgressBarVisible(false);
         }
+        setLoading(true, false);
+        mIsWifiEntriesLoading = true;
     }
 
     @Override