commit 2d90a6321a82475bf3c130ceb10b10db520bd13f
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 08 15:21:25 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 08 15:21:25 2021 +0000
tree e5a4cec822d74b7c194dadbcb4249f3745c27957
parent a73d199d5eec72146202cfd97c92eba5f9f9bee2
parent 62560c7210e7637ae99846a336e6a747b97dafbb

Merge "Hide the entire progress header in Internet Settings" into sc-dev

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

diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index f6e7917..38658e7 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -207,8 +207,6 @@
 
     private WifiDialog2 mDialog;
 
-    private View mProgressHeader;
-
     @VisibleForTesting
     PreferenceCategory mConnectedWifiEntryPreferenceCategory;
     @VisibleForTesting
@@ -255,8 +253,7 @@
             return;
         }
 
-        mProgressHeader = setPinnedHeaderView(R.layout.progress_header)
-                .findViewById(R.id.progress_bar_animation);
+        setPinnedHeaderView(R.layout.progress_header);
         setProgressBarVisible(false);
 
         mWifiManager = activity.getSystemService(WifiManager.class);
@@ -1006,9 +1003,7 @@
     }
 
     protected void setProgressBarVisible(boolean visible) {
-        if (mProgressHeader != null) {
-            mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE);
-        }
+        showPinnedHeader(visible);
     }
 
     @VisibleForTesting