Merge "Move horizontal progress bar into SettingsLib."

2019-02-13 13:53:56 +00:00
parent 3eaa0ac051 ad0e49bd6e
commit cd15971f14
6 changed files with 2 additions and 126 deletions
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -203,7 +203,7 @@ public class WifiSettings extends RestrictedSettingsFragment
        super.onViewCreated(view, savedInstanceState);
        final Activity activity = getActivity();
        if (activity != null) {
-            mProgressHeader = setPinnedHeaderView(R.layout.wifi_progress_header)
+            mProgressHeader = setPinnedHeaderView(R.layout.progress_header)
                    .findViewById(R.id.progress_bar_animation);
            setProgressBarVisible(false);
        }