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

Merge "[WifiSettings] Add progress bar when scanning" into mnc-dev

Browse Source
This commit is contained in:
Maurice Lam
2015-04-30 17:53:19 +00:00
committed by Android (Google) Code Review
parent 48b1884a4a 28c3f6bb71
commit e0bf739ddf
10 changed files with 145 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -56,6 +56,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.TextView.BufferType;
import android.widget.Toast;
@@ -127,6 +128,7 @@ public class WifiSettings extends RestrictedSettingsFragment
private WriteWifiConfigToNfcDialog mWifiToNfcDialog;
private TextView mEmptyView;
private ProgressBar mProgressHeader;
// this boolean extra specifies whether to disable the Next button when not connected. Used by
// account creation outside of setup wizard.
@@ -152,6 +154,15 @@ public class WifiSettings extends RestrictedSettingsFragment
super(DISALLOW_CONFIG_WIFI);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
final Activity activity = getActivity();
if (activity != null) {
mProgressHeader = (ProgressBar) setPinnedHeaderView(R.layout.wifi_progress_header);
}
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
@@ -711,7 +722,9 @@ public class WifiSettings extends RestrictedSettingsFragment
}
protected void setProgressBarVisible(boolean visible) {
// TODO: show a progress bar when scan is in progress.
if (mProgressHeader != null) {
mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE);
}
}
@Override