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

Remove "Allow incoming file transfers" option from BT settings.

Browse Source 
The user preference to allow automatic incoming file transfers for
specific devices isn't implemented yet. Remove the preference from
the settings UI.

Bug: 3385941
Change-Id: Ib8fee9a0d99063a8c05d52a960664364e4812ace
This commit is contained in:
Jake Hamby
2011-01-25 13:50:54 -08:00
parent a34279fb2a
commit 51cd0d6d29
2 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/bluetooth_device_advanced.xml
View File

@@ -28,12 +28,6 @@
android:order="20" android:order="20"
android:persistent="false" /> android:persistent="false" />
<CheckBoxPreference
android:key="allow_incoming"
android:title="@string/bluetooth_device_advanced_enable_opp_title"
android:order="30"
android:persistent="false" />
<Preference <Preference
android:key="unpair" android:key="unpair"
android:title="@string/bluetooth_device_context_unpair" android:title="@string/bluetooth_device_context_unpair"

16
src/com/android/settings/bluetooth/DeviceProfilesSettings.java
View File

@@ -58,7 +58,6 @@ public class DeviceProfilesSettings extends SettingsPreferenceFragment
private CachedBluetoothDevice mCachedDevice; private CachedBluetoothDevice mCachedDevice;
private PreferenceGroup mProfileContainer; private PreferenceGroup mProfileContainer;
private CheckBoxPreference mAllowIncomingPref;
private EditTextPreference mDeviceNamePref; private EditTextPreference mDeviceNamePref;
private final HashMap<String,CheckBoxPreference> mAutoConnectPrefs private final HashMap<String,CheckBoxPreference> mAutoConnectPrefs
= new HashMap<String,CheckBoxPreference>(); = new HashMap<String,CheckBoxPreference>();
@@ -93,17 +92,6 @@ public class DeviceProfilesSettings extends SettingsPreferenceFragment
getPreferenceScreen().setOrderingAsAdded(false); getPreferenceScreen().setOrderingAsAdded(false);
mProfileContainer = (PreferenceGroup) findPreference(KEY_PROFILE_CONTAINER); 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 = (EditTextPreference) findPreference(KEY_RENAME_DEVICE);
mDeviceNamePref.setSummary(mCachedDevice.getName()); mDeviceNamePref.setSummary(mCachedDevice.getName());
@@ -210,9 +198,7 @@ public class DeviceProfilesSettings extends SettingsPreferenceFragment
} }
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
if (preference == mAllowIncomingPref) { if (preference == mDeviceNamePref) {
setIncomingFileTransfersAllowed((Boolean) newValue);
} else if (preference == mDeviceNamePref) {
mCachedDevice.setName((String) newValue); mCachedDevice.setName((String) newValue);
} else if (preference instanceof CheckBoxPreference) { } else if (preference instanceof CheckBoxPreference) {
boolean autoConnect = (Boolean) newValue; boolean autoConnect = (Boolean) newValue;