PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev am: 1803aead52

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

Change-Id: Ie01368e09f786bee4420d6cf87d0b59cc5420834
This commit is contained in:
TreeHugger Robot
2021-06-16 11:42:15 +00:00
committed by Automerger Merge Worker
parent 1f0a69cdf2 1803aead52
commit f8c5e7357e
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/settings/network/NetworkProviderSettings.java
View File

@@ -169,14 +169,18 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
return WifiPickerTracker.isVerboseLoggingEnabled();
}
private boolean mIsWifiEntriesLoading;
private boolean mIsViewLoading;
private final Runnable mRemoveLoadingRunnable = () -> {
if (mIsViewLoading) {
setLoading(false, false);
mIsViewLoading = false;
}
};
private boolean mIsWifiEntryListStale = true;
private final Runnable mUpdateWifiEntryPreferencesRunnable = () -> {
updateWifiEntryPreferences();
if (mIsWifiEntriesLoading) {
setLoading(false, false);
mIsWifiEntriesLoading = false;
}
getView().postDelayed(mRemoveLoadingRunnable, 10);
};
private final Runnable mHideProgressBarRunnable = () -> {
setProgressBarVisible(false);
@@ -250,14 +254,23 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
final Activity activity = getActivity();
if (activity != null) {
Activity activity = getActivity();
if (activity == null) {
return;
}
mProgressHeader = setPinnedHeaderView(R.layout.progress_header)
.findViewById(R.id.progress_bar_animation);
setProgressBarVisible(false);
}
mWifiManager = activity.getSystemService(WifiManager.class);
if (mWifiManager != null) {
setLoading(true, false);
mIsWifiEntriesLoading = true;
mIsViewLoading = true;
if (!mWifiManager.isWifiEnabled()) {
getView().postDelayed(mRemoveLoadingRunnable, 100);
}
}
}
@Override
@@ -339,12 +352,6 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
mWifiPickerTracker = mWifiPickerTrackerHelper.getWifiPickerTracker();
mInternetUpdater = new InternetUpdater(getContext(), getSettingsLifecycle(), this);
final Activity activity = getActivity();
if (activity != null) {
mWifiManager = getActivity().getSystemService(WifiManager.class);
}
mConnectListener = new WifiConnectListener(getActivity());
mSaveListener = new WifiManager.ActionListener() {