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

Merge "Add wifi direct menu only for supported devices" into jb-dev

Browse Source
This commit is contained in:
Irfan Sheriff
2012-04-30 17:12:33 -07:00
committed by Android (Google) Code Review
parent 1d1cd10a2a e8d79cf188
commit a90015c2c9
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
@@ -110,6 +111,7 @@ public class WifiSettings extends SettingsPreferenceFragment
private WifiManager.ActionListener mConnectListener; private WifiManager.ActionListener mConnectListener;
private WifiManager.ActionListener mSaveListener; private WifiManager.ActionListener mSaveListener;
private WifiManager.ActionListener mForgetListener; private WifiManager.ActionListener mForgetListener;
private boolean mP2pSupported;
private WifiEnabler mWifiEnabler; private WifiEnabler mWifiEnabler;
@@ -175,6 +177,7 @@ public class WifiSettings extends SettingsPreferenceFragment
// Preference (probably in onCreate()), while WifiSettings exceptionally set it up in // Preference (probably in onCreate()), while WifiSettings exceptionally set it up in
// this method. // this method.
mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT);
mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
mChannel = mWifiManager.initialize(getActivity(), getActivity().getMainLooper(), null); mChannel = mWifiManager.initialize(getActivity(), getActivity().getMainLooper(), null);
@@ -306,9 +309,11 @@ public class WifiSettings extends SettingsPreferenceFragment
menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc) menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
.setEnabled(wifiIsEnabled) .setEnabled(wifiIsEnabled)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
menu.add(Menu.NONE, MENU_ID_P2P, 0, R.string.wifi_menu_p2p) if (mP2pSupported) {
.setEnabled(wifiIsEnabled) menu.add(Menu.NONE, MENU_ID_P2P, 0, R.string.wifi_menu_p2p)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); .setEnabled(wifiIsEnabled)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
}
menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network) menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
.setEnabled(wifiIsEnabled) .setEnabled(wifiIsEnabled)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);