diff options
Diffstat (limited to 'src/com/android/settings/wifi')
| -rw-r--r-- | src/com/android/settings/wifi/WifiEnabler.java | 5 | ||||
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java index ad0ba56..e41429b 100644 --- a/src/com/android/settings/wifi/WifiEnabler.java +++ b/src/com/android/settings/wifi/WifiEnabler.java @@ -38,7 +38,7 @@ import com.android.settings.search.Index; import java.util.concurrent.atomic.AtomicBoolean; public class WifiEnabler implements CompoundButton.OnCheckedChangeListener { - private final Context mContext; + private Context mContext; private Switch mSwitch; private AtomicBoolean mConnected = new AtomicBoolean(false); @@ -77,7 +77,8 @@ public class WifiEnabler implements CompoundButton.OnCheckedChangeListener { mIntentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); } - public void resume() { + public void resume(Context context) { + mContext = context; // Wi-Fi state is sticky, so just let the receiver update UI mContext.registerReceiver(mReceiver, mIntentFilter); mSwitch.setOnCheckedChangeListener(this); diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 667feb3..21fecd3 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -416,7 +416,7 @@ public class WifiSettings extends RestrictedSettingsFragment if (activity instanceof SettingsActivity) { SettingsActivity sa = (SettingsActivity) activity; - addSwitch = !sa.onIsHidingHeaders(); + addSwitch = sa.onIsHidingHeaders(); } else if (activity instanceof WifiPickerActivity) { PreferenceActivity pa = (PreferenceActivity) activity; addSwitch = pa.onIsHidingHeaders(); @@ -458,12 +458,13 @@ public class WifiSettings extends RestrictedSettingsFragment @Override public void onResume() { + final Activity activity = getActivity(); super.onResume(); if (mWifiEnabler != null) { - mWifiEnabler.resume(); + mWifiEnabler.resume(activity); } - getActivity().registerReceiver(mReceiver, mFilter); + activity.registerReceiver(mReceiver, mFilter); updateAccessPoints(); } @@ -497,11 +498,11 @@ public class WifiSettings extends RestrictedSettingsFragment menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc) .setIcon(ta.getDrawable(1)) .setEnabled(wifiIsEnabled) - .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network) .setIcon(ta.getDrawable(0)) .setEnabled(wifiIsEnabled) - .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.wifi_menu_scan) //.setIcon(R.drawable.ic_menu_scan_network) .setEnabled(wifiIsEnabled) |