Bluetooth: Create new catogory for earbuds (6372a3ae) · Commits · e / os / android_packages_apps_Settings

res/values/cm_strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -151,4 +151,7 @@
		<!-- Backup Transport selection settings menu and activity title -->
		<string name="backup_transport_setting_label">Change backup provider</string>
		<string name="backup_transport_title">Select backup provider</string>

		<!-- Title for connected TWS device group [CHAR LIMIT=none]-->
		<string name="connected_tws_device_saved_title">Saved Earbuds</string>
		</resources>

res/xml/connected_devices.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,11 @@
		android:title="@string/connected_device_other_device_title"
		settings:controller="com.android.settings.connecteddevice.ConnectedDeviceGroupController"/>

		<PreferenceCategory
		android:key="saved_tws_device_list"
		android:title="@string/connected_tws_device_saved_title"
		settings:controller="com.android.settings.connecteddevice.SavedTwsDeviceGroupController"/>

		<com.android.settingslib.RestrictedPreference
		android:key="add_bt_devices"
		android:title="@string/bluetooth_pairing_pref_title"

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

+37 −2

Original line number	Diff line number	Diff line
		/*
		*Copyright (c) 2018, The Linux Foundation. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted (subject to the limitations in the
		* disclaimer below) provided that the following conditions are met:
		*
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		*
		* * Redistributions in binary form must reproduce the above
		* copyright notice, this list of conditions and the following
		* disclaimer in the documentation and/or other materials provided
		* with the distribution.
		*
		* * Neither the name of The Linux Foundation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.

		* NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
		* GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
		* HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
		* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
		* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
		* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
		* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
		* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
		* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
		* IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
		* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
		* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*/
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		@@ -102,10 +135,12 @@ public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater
		if (DBG) {
		Log.d(TAG, "isFilterMatched() device name : " + cachedDevice.getName() +
		", is connected : " + device.isConnected() + ", is profile connected : "
		+ cachedDevice.isConnected());
		+ cachedDevice.isConnected() +
		", is twsplusdevice : " + device.isTwsPlusDevice());
		}
		return device.getBondState() == BluetoothDevice.BOND_BONDED
		&& (mDisplayConnected \|\| !device.isConnected());
		&& (mDisplayConnected \|\| !device.isConnected())
		&& !device.isTwsPlusDevice();
		}

		@Override

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

0 → 100644

+91 −0

Original line number	Diff line number	Diff line
		/*
		*Copyright (c) 2018, The Linux Foundation. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted (subject to the limitations in the
		* disclaimer below) provided that the following conditions are met:
		*
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		*
		* * Redistributions in binary form must reproduce the above
		* copyright notice, this list of conditions and the following
		* disclaimer in the documentation and/or other materials provided
		* with the distribution.
		*
		* * Neither the name of The Linux Foundation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.

		* NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
		* GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
		* HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
		* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
		* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
		* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
		* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
		* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
		* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
		* IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
		* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
		* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*/
		/*
		* 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.content.Context;

		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 TWS+ bluetooth devices(bonded but not connected)
		*/
		public class SavedBluetoothTwsDeviceUpdater extends BluetoothDeviceUpdater {

		public SavedBluetoothTwsDeviceUpdater(Context context, DashboardFragment fragment,
		DevicePreferenceCallback devicePreferenceCallback) {
		super(context, fragment, devicePreferenceCallback);
		}

		SavedBluetoothTwsDeviceUpdater(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() && device.isTwsPlusDevice();
		}
		}

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

+34 −0

Original line number	Diff line number	Diff line
		/*
		*Copyright (c) 2018, The Linux Foundation. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted (subject to the limitations in the
		* disclaimer below) provided that the following conditions are met:
		*
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		*
		* * Redistributions in binary form must reproduce the above
		* copyright notice, this list of conditions and the following
		* disclaimer in the documentation and/or other materials provided
		* with the distribution.
		*
		* * Neither the name of The Linux Foundation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.

		* NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
		* GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
		* HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
		* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
		* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
		* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
		* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
		* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
		* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
		* IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
		* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
		* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*/
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		@@ -71,6 +104,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
		SettingsUIDeviceConfig.BT_NEAR_BY_SUGGESTION_ENABLED, true);
		use(AvailableMediaDeviceGroupController.class).init(this);
		use(ConnectedDeviceGroupController.class).init(this);
		use(SavedTwsDeviceGroupController.class).init(this);
		use(PreviouslyConnectedDevicePreferenceController.class).init(this);
		use(SlicePreferenceController.class).setSliceUri(nearbyEnabled
		? Uri.parse(getString(R.string.config_nearby_devices_slice_uri))