summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Chan <mchan@android.com>2010-03-02 17:42:32 -0800
committerMichael Chan <mchan@android.com>2010-03-02 17:42:32 -0800
commit628f9b3889a73872131681eaf4bbd4c41f56a0be (patch)
tree52e56c998af0eb91c5adb6e2c1c0a6a5f3ac5bdb
parent385a9e52be6f3a6014d6aaca06a800289e90b528 (diff)
downloadpackages_apps_settings-628f9b3889a73872131681eaf4bbd4c41f56a0be.zip
packages_apps_settings-628f9b3889a73872131681eaf4bbd4c41f56a0be.tar.gz
packages_apps_settings-628f9b3889a73872131681eaf4bbd4c41f56a0be.tar.bz2
b/2482585 Bluetooth settings: remove "Scan for devices" from menu
Change-Id: I206794245a6afeb97366dd32e609f4e7f9374c20
-rw-r--r--src/com/android/settings/bluetooth/BluetoothSettings.java30
1 files changed, 0 insertions, 30 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 4f3205b..42e5832 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -35,7 +35,6 @@ import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
import android.view.ContextMenu;
-import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ContextMenu.ContextMenuInfo;
@@ -53,8 +52,6 @@ public class BluetoothSettings extends PreferenceActivity
private static final String TAG = "BluetoothSettings";
- private static final int MENU_SCAN = Menu.FIRST;
-
private static final String KEY_BT_CHECKBOX = "bt_checkbox";
private static final String KEY_BT_DISCOVERABLE = "bt_discoverable";
private static final String KEY_BT_DEVICE_LIST = "bt_device_list";
@@ -217,33 +214,6 @@ public class BluetoothSettings extends PreferenceActivity
}
@Override
- public boolean onCreateOptionsMenu(Menu menu) {
- menu.add(0, MENU_SCAN, 0, R.string.bluetooth_scan_for_devices)
- .setIcon(com.android.internal.R.drawable.ic_menu_refresh)
- .setAlphabeticShortcut('r');
- return true;
- }
-
- @Override
- public boolean onPrepareOptionsMenu(Menu menu) {
- menu.findItem(MENU_SCAN).setEnabled(mLocalManager.getBluetoothAdapter().isEnabled());
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
-
- case MENU_SCAN:
- mLocalManager.startScanning(true);
- return true;
-
- default:
- return false;
- }
- }
-
- @Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
Preference preference) {