From 51cd0d6d29c8f8f5320968f778b04b448984abc8 Mon Sep 17 00:00:00 2001
From: Jake Hamby <jhamby@google.com>
Date: Tue, 25 Jan 2011 13:50:54 -0800
Subject: [PATCH] Remove "Allow incoming file transfers" option from BT
 settings.

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
---
 res/xml/bluetooth_device_advanced.xml                    |  6 ------
 .../settings/bluetooth/DeviceProfilesSettings.java       | 16 +---------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/res/xml/bluetooth_device_advanced.xml b/res/xml/bluetooth_device_advanced.xml
index b4a097860c..6610a69d58 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" />
 
-    <CheckBoxPreference
-            android:key="allow_incoming"
-            android:title="@string/bluetooth_device_advanced_enable_opp_title"
-            android:order="30"
-            android:persistent="false" />
-
     <Preference
             android:key="unpair"
             android:title="@string/bluetooth_device_context_unpair"
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index 479cbe0c8b..f39eabdc42 100644
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -58,7 +58,6 @@ public class DeviceProfilesSettings extends SettingsPreferenceFragment
     private CachedBluetoothDevice mCachedDevice;
 
     private PreferenceGroup mProfileContainer;
-    private CheckBoxPreference mAllowIncomingPref;
     private EditTextPreference mDeviceNamePref;
     private final HashMap<String,CheckBoxPreference> mAutoConnectPrefs
             = new HashMap<String,CheckBoxPreference>();
@@ -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;
-- 
2.11.0