Merge "Remove the function that not used in BluetoothCallback" (05bec1d1) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java

+0 −14

Original line number	Diff line number	Diff line
		@@ -127,9 +127,6 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
		forceUpdate();
		}

		@Override
		public void onScanningStateChanged(boolean started) {}

		@Override
		public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
		update(cachedDevice);
		@@ -148,17 +145,6 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
		update(cachedDevice);
		}

		@Override
		public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {}

		@Override
		public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {
		}

		@Override
		public void onAudioModeChanged() {
		}

		@Override
		public void onProfileConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state,
		int bluetoothProfile) {

+0 −24

Original line number	Diff line number	Diff line
		@@ -58,30 +58,6 @@ public final class BluetoothSummaryUpdater extends SummaryUpdater implements Blu
		notifyChangeIfNeeded();
		}

		@Override
		public void onScanningStateChanged(boolean started) {
		}

		@Override
		public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
		}

		@Override
		public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
		}

		@Override
		public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
		}

		@Override
		public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {
		}

		@Override
		public void onAudioModeChanged() {
		}

		@Override
		public void register(boolean listening) {
		if (mBluetoothAdapter == null) {

+0 −11

Original line number	Diff line number	Diff line
		@@ -244,9 +244,6 @@ public abstract class DeviceListPreferenceFragment extends
		}
		}

		@Override
		public void onBluetoothStateChanged(int bluetoothState) {}

		/**
		* Add bluetooth device preferences to {@code preferenceGroup} which satisfy the {@code filter}
		*
		@@ -270,14 +267,6 @@ public abstract class DeviceListPreferenceFragment extends
		removeCachedPrefs(preferenceGroup);
		}

		public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { }

		@Override
		public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) { }

		@Override
		public void onAudioModeChanged() { }

		/**
		* Return the key of the {@link PreferenceGroup} that contains the bluetooth devices
		*/

+0 −36

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import com.android.settings.bluetooth.Utils;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settingslib.bluetooth.BluetoothCallback;
		import com.android.settingslib.bluetooth.CachedBluetoothDevice;
		import com.android.settingslib.bluetooth.LocalBluetoothManager;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		import com.android.settingslib.core.lifecycle.events.OnStart;
		@@ -131,41 +130,6 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
		mBluetoothDeviceUpdater = bluetoothDeviceUpdater;
		}

		@Override
		public void onBluetoothStateChanged(int bluetoothState) {
		// do nothing
		}

		@Override
		public void onScanningStateChanged(boolean started) {
		// do nothing
		}

		@Override
		public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
		// do nothing
		}

		@Override
		public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
		// do nothing
		}

		@Override
		public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
		// do nothing
		}

		@Override
		public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
		// do nothing
		}

		@Override
		public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {
		// do nothing
		}

		@Override
		public void onAudioModeChanged() {
		updateTitle();

+0 −27

Original line number	Diff line number	Diff line
		@@ -184,14 +184,6 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
		unregister();
		}

		/**
		* Only concerned about whether the local adapter is connected to any profile of any device and
		* are not really concerned about which profile.
		*/
		@Override
		public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
		}

		@Override
		public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {
		updateState(mPreference);
		@@ -208,17 +200,6 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
		updateState(mPreference);
		}

		@Override
		public void onBluetoothStateChanged(int bluetoothState) {
		}

		/**
		* The local Bluetooth adapter has started the remote device discovery process.
		*/
		@Override
		public void onScanningStateChanged(boolean started) {
		}

		/**
		* Indicates a change in the bond state of a remote
		* device. For example, if a device is bonded (paired).
		@@ -228,14 +209,6 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
		updateState(mPreference);
		}

		@Override
		public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
		}

		@Override
		public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
		}

		public void setCallback(AudioSwitchCallback callback) {
		mAudioSwitchPreferenceCallback = callback;
		}