Merge "Add preference group for saved devcies." (211550f5) · Commits · e / os / android_packages_apps_Settings

res/xml/connected_devices.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -22,4 +22,8 @@
		<PreferenceCategory
		android:key="connected_device_list"
		android:title="@string/connected_device_connected_title"/>

		<PreferenceCategory
		android:key="saved_device_list"
		android:title="@string/connected_device_saved_title"/>
		</PreferenceScreen>

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

+14 −1

Original line number	Diff line number	Diff line
		@@ -148,10 +148,23 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback {
		mPrefContext = context;
		}

		/**
		* Return {@code true} if {@code cachedBluetoothDevice} matches this
		* {@link BluetoothDeviceUpdater} and should stay in the list, otherwise return {@code false}
		*/
		public abstract boolean isFilterMatched(CachedBluetoothDevice cachedBluetoothDevice);

		/**
		* Update whether to show {@cde cachedBluetoothDevice} in the list.
		*/
		abstract public void update(CachedBluetoothDevice cachedBluetoothDevice);
		protected void update(CachedBluetoothDevice cachedBluetoothDevice) {
		if (isFilterMatched(cachedBluetoothDevice)) {
		// Add the preference if it is new one
		addPreference(cachedBluetoothDevice);
		} else {
		removePreference(cachedBluetoothDevice);
		}
		}

		/**
		* Add the {@link Preference} that represents the {@code cachedDevice}

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

+2 −10

Original line number	Diff line number	Diff line
		@@ -51,16 +51,8 @@ public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {
		}

		@Override
		public void update(CachedBluetoothDevice cachedDevice) {
		public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {
		final BluetoothDevice device = cachedDevice.getDevice();
		final boolean filterMatch =
		device.getBondState() == BluetoothDevice.BOND_BONDED && device.isConnected();

		if (filterMatch) {
		// Add the preference if it is new one
		addPreference(cachedDevice);
		} else {
		removePreference(cachedDevice);
		}
		return device.getBondState() == BluetoothDevice.BOND_BONDED && device.isConnected();
		}
		}

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

0 → 100644

+58 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.settings.bluetooth;

		import android.bluetooth.BluetoothAdapter;
		import android.bluetooth.BluetoothDevice;
		import android.support.annotation.VisibleForTesting;

		import com.android.settings.connecteddevice.DevicePreferenceCallback;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settingslib.bluetooth.CachedBluetoothDevice;
		import com.android.settingslib.bluetooth.LocalBluetoothManager;

		/**
		* Maintain and update saved bluetooth devices(bonded but not connected)
		*/
		public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {

		public SavedBluetoothDeviceUpdater(DashboardFragment fragment,
		DevicePreferenceCallback devicePreferenceCallback) {
		super(fragment, devicePreferenceCallback);
		}

		@VisibleForTesting
		SavedBluetoothDeviceUpdater(DashboardFragment fragment,
		DevicePreferenceCallback devicePreferenceCallback,
		LocalBluetoothManager localBluetoothManager) {
		super(fragment, devicePreferenceCallback, localBluetoothManager);
		}

		@Override
		public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
		if (state == BluetoothAdapter.STATE_CONNECTED) {
		removePreference(cachedDevice);
		} else if (state == BluetoothAdapter.STATE_DISCONNECTED) {
		addPreference(cachedDevice);
		}
		}

		@Override
		public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {
		final BluetoothDevice device = cachedDevice.getDevice();
		return device.getBondState() == BluetoothDevice.BOND_BONDED && !device.isConnected();
		}
		}

src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -62,9 +62,8 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
		final List<AbstractPreferenceController> controllers = new ArrayList<>();
		final Lifecycle lifecycle = getLifecycle();

		final ConnectedDeviceGroupController connectedDeviceGroupController =
		new ConnectedDeviceGroupController(this, lifecycle);
		controllers.add(connectedDeviceGroupController);
		controllers.add(new ConnectedDeviceGroupController(this, lifecycle));
		controllers.add(new SavedDeviceGroupController(this, lifecycle));
		return controllers;

		}