diff --git a/res/xml/bluetooth_device_advanced.xml b/res/xml/bluetooth_device_advanced.xml index b4a097860cf..6610a69d580 100644 --- a/res/xml/bluetooth_device_advanced.xml +++ b/res/xml/bluetooth_device_advanced.xml @@ -28,12 +28,6 @@ android:order="20" android:persistent="false" /> - - mAutoConnectPrefs = new HashMap(); @@ -93,17 +92,6 @@ public class DeviceProfilesSettings extends SettingsPreferenceFragment getPreferenceScreen().setOrderingAsAdded(false); mProfileContainer = (PreferenceGroup) findPreference(KEY_PROFILE_CONTAINER); - mAllowIncomingPref = (CheckBoxPreference) findPreference(KEY_ALLOW_INCOMING); - - // Configure incoming file transfer preference if device supports OPP - // or else remove the preference item - if (isObjectPushSupported(device)) { - mAllowIncomingPref.setChecked(isIncomingFileTransfersAllowed()); - mAllowIncomingPref.setOnPreferenceChangeListener(this); - } else { - getPreferenceScreen().removePreference(mAllowIncomingPref); - mAllowIncomingPref = null; - } mDeviceNamePref = (EditTextPreference) findPreference(KEY_RENAME_DEVICE); mDeviceNamePref.setSummary(mCachedDevice.getName()); @@ -210,9 +198,7 @@ public class DeviceProfilesSettings extends SettingsPreferenceFragment } public boolean onPreferenceChange(Preference preference, Object newValue) { - if (preference == mAllowIncomingPref) { - setIncomingFileTransfersAllowed((Boolean) newValue); - } else if (preference == mDeviceNamePref) { + if (preference == mDeviceNamePref) { mCachedDevice.setName((String) newValue); } else if (preference instanceof CheckBoxPreference) { boolean autoConnect = (Boolean) newValue;