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

Merge "Remove device name and display debug setting"

Browse Source
This commit is contained in:
Irfan Sheriff
2011-09-01 21:46:43 -07:00
committed by Android (Google) Code Review
parent f3a3d04bba e964d57152
commit eb913af2a6
2 changed files with 6 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

@@ -50,7 +50,7 @@ public class WirelessSettings extends SettingsPreferenceFragment {
private static final String KEY_PROXY_SETTINGS = "proxy_settings"; private static final String KEY_PROXY_SETTINGS = "proxy_settings";
private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings"; private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
private static final Boolean WIFI_P2P_DEBUG = false; 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 String EXIT_ECM_RESULT = "exit_ecm_result";
public static final int REQUEST_CODE_EXIT_ECM = 1; public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -143,14 +143,14 @@ public class WirelessSettings extends SettingsPreferenceFragment {
if (!p2p.isP2pSupported()) { if (!p2p.isP2pSupported()) {
getPreferenceScreen().removePreference(wifiP2p); getPreferenceScreen().removePreference(wifiP2p);
getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
} else { } else {
mWifiP2pEnabler = new WifiP2pEnabler(activity, wifiP2p); mWifiP2pEnabler = new WifiP2pEnabler(activity, wifiP2p);
}
//Settings is used for debug alone //Settings is used for debug alone
if (!WIFI_P2P_DEBUG) { 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. // Enable Proxy selector settings if allowed.
Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS); Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS);

1
src/com/android/settings/wifi/p2p/WifiP2pDialog.java
View File

@@ -64,7 +64,6 @@ public class WifiP2pDialog extends AlertDialog implements AdapterView.OnItemSele
public WifiP2pConfig getConfig() { public WifiP2pConfig getConfig() {
WifiP2pConfig config = new WifiP2pConfig(); WifiP2pConfig config = new WifiP2pConfig();
config.deviceAddress = mDeviceAddress.getText().toString(); config.deviceAddress = mDeviceAddress.getText().toString();
config.deviceName = mDeviceName.getText().toString();
config.wpsConfig = new WpsConfiguration(); config.wpsConfig = new WpsConfiguration();
switch (mWpsSetupIndex) { switch (mWpsSetupIndex) {
case WPS_PBC: case WPS_PBC: