Merge "Hide the entire progress header in Internet Settings" into sc-dev am: 2d90a6321a am: 06a1f62fa8

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

Change-Id: I16dad8c8189cdcf716d0aef4ffbadc29348f9fb8
This commit is contained in:
TreeHugger Robot
2021-07-08 15:47:50 +00:00
committed by Automerger Merge Worker

View File

@@ -207,8 +207,6 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
private WifiDialog2 mDialog; private WifiDialog2 mDialog;
private View mProgressHeader;
@VisibleForTesting @VisibleForTesting
PreferenceCategory mConnectedWifiEntryPreferenceCategory; PreferenceCategory mConnectedWifiEntryPreferenceCategory;
@VisibleForTesting @VisibleForTesting
@@ -255,8 +253,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
return; return;
} }
mProgressHeader = setPinnedHeaderView(R.layout.progress_header) setPinnedHeaderView(R.layout.progress_header);
.findViewById(R.id.progress_bar_animation);
setProgressBarVisible(false); setProgressBarVisible(false);
mWifiManager = activity.getSystemService(WifiManager.class); mWifiManager = activity.getSystemService(WifiManager.class);
@@ -1006,9 +1003,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
} }
protected void setProgressBarVisible(boolean visible) { protected void setProgressBarVisible(boolean visible) {
if (mProgressHeader != null) { showPinnedHeader(visible);
mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE);
}
} }
@VisibleForTesting @VisibleForTesting