Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev

am: fd29aada6b

Change-Id: I30e9087f3e90055ccc1192743814c42f3a28a21e
This commit is contained in:
Fan Zhang
2017-04-11 23:42:46 +00:00
committed by android-build-merger
8 changed files with 147 additions and 112 deletions

View File

@@ -61,11 +61,6 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
mLaunchClass = intent.getStringExtra(BluetoothDevicePicker.EXTRA_LAUNCH_CLASS);
}
@Override
void initDevicePreference(BluetoothDevicePreference preference) {
preference.setWidgetLayoutResource(R.layout.preference_empty_list);
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.add(Menu.NONE, MENU_ID_REFRESH, 0, R.string.bluetooth_search_for_devices)