diff --git a/res/layout/wifi_progress_header.xml b/res/layout/wifi_progress_header.xml index 05518ae6a8f..3f5d42892c5 100644 --- a/res/layout/wifi_progress_header.xml +++ b/res/layout/wifi_progress_header.xml @@ -15,8 +15,20 @@ limitations under the License. --> - + android:layout_height="3dp" + xmlns:android="http://schemas.android.com/apk/res/android"> + + + diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index cb4e723b05e..cc4cc8abe3c 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -49,7 +49,6 @@ import android.view.ContextMenu.ContextMenuInfo; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.widget.ProgressBar; import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -140,7 +139,7 @@ public class WifiSettings extends RestrictedSettingsFragment private WifiDialog mDialog; private WriteWifiConfigToNfcDialog mWifiToNfcDialog; - private ProgressBar mProgressHeader; + private View mProgressHeader; // this boolean extra specifies whether to disable the Next button when not connected. Used by // account creation outside of setup wizard. @@ -187,7 +186,8 @@ public class WifiSettings extends RestrictedSettingsFragment super.onViewCreated(view, savedInstanceState); final Activity activity = getActivity(); if (activity != null) { - mProgressHeader = (ProgressBar) setPinnedHeaderView(R.layout.wifi_progress_header); + mProgressHeader = setPinnedHeaderView(R.layout.wifi_progress_header) + .findViewById(R.id.progress_bar_animation); setProgressBarVisible(false); } } @@ -909,7 +909,7 @@ public class WifiSettings extends RestrictedSettingsFragment protected void setProgressBarVisible(boolean visible) { if (mProgressHeader != null) { - mProgressHeader.setVisibility(visible ? View.VISIBLE : View.INVISIBLE); + mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE); } }