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

am cd5b0233: am cb5fa5a4: Merge "Remove wifidirect UI listing" into ics-mr0

Browse Source 
* commit 'cd5b0233bb73880e4d2f40633d33f1a6eb63e4b9':
  Remove wifidirect UI listing
This commit is contained in:
Irfan Sheriff
2011-10-21 14:40:48 -07:00
committed by Android Git Automerger
parent c70f77f4ca cd5b0233bb
commit 28e8abc95b
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/WirelessSettings.java
View File

@@ -51,8 +51,6 @@ public class WirelessSettings extends SettingsPreferenceFragment {
private static final String KEY_PROXY_SETTINGS = "proxy_settings";
private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
private static final int WIFI_P2P_DEBUG = SystemProperties.getInt("ro.debuggable", 0);
public static final String EXIT_ECM_RESULT = "exit_ecm_result";
public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -144,14 +142,10 @@ public class WirelessSettings extends SettingsPreferenceFragment {
if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)) {
getPreferenceScreen().removePreference(wifiP2p);
getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
} else {
mWifiP2pEnabler = new WifiP2pEnabler(activity, wifiP2p);
//Settings is used for debug alone
if (WIFI_P2P_DEBUG == 0) {
getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
}
}
getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
// Enable Proxy selector settings if allowed.
Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS);