diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-04-30 17:12:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-30 17:12:33 -0700 |
| commit | a90015c2c9795479ce6f1896f443948d615fd0c5 (patch) | |
| tree | d23f949059e47cc46afe72b1227a5f29781c4dec /src/com | |
| parent | 1d1cd10a2afd29e2e9a501ced2a8d788e9330fd1 (diff) | |
| parent | e8d79cf188a79c44ea6a801c2e101564ab630288 (diff) | |
| download | packages_apps_settings-a90015c2c9795479ce6f1896f443948d615fd0c5.zip packages_apps_settings-a90015c2c9795479ce6f1896f443948d615fd0c5.tar.gz packages_apps_settings-a90015c2c9795479ce6f1896f443948d615fd0c5.tar.bz2 | |
Merge "Add wifi direct menu only for supported devices" into jb-dev
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index d0af893..a50b3cf 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -27,6 +27,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; +import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.NetworkInfo.DetailedState; @@ -110,6 +111,7 @@ public class WifiSettings extends SettingsPreferenceFragment private WifiManager.ActionListener mConnectListener; private WifiManager.ActionListener mSaveListener; private WifiManager.ActionListener mForgetListener; + private boolean mP2pSupported; private WifiEnabler mWifiEnabler; @@ -175,6 +177,7 @@ public class WifiSettings extends SettingsPreferenceFragment // Preference (probably in onCreate()), while WifiSettings exceptionally set it up in // this method. + mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT); mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); 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) .setEnabled(wifiIsEnabled) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); - menu.add(Menu.NONE, MENU_ID_P2P, 0, R.string.wifi_menu_p2p) - .setEnabled(wifiIsEnabled) - .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + if (mP2pSupported) { + menu.add(Menu.NONE, MENU_ID_P2P, 0, R.string.wifi_menu_p2p) + .setEnabled(wifiIsEnabled) + .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + } menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network) .setEnabled(wifiIsEnabled) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); |