Merge "Implement audio switch UI" into pi-dev (608d436d) · Commits · e / os / android_packages_apps_Settings

res/xml/connected_devices.xml

+7 −1

Original line number	Diff line number	Diff line
		@@ -20,9 +20,15 @@
		android:key="connected_devices_screen"
		android:title="@string/connected_devices_dashboard_title">

		<PreferenceCategory
		android:key="available_device_list"
		android:title="@string/connected_device_available_media_title"
		settings:controller="com.android.settings.connecteddevice.AvailableMediaDeviceGroupController"/>

		<PreferenceCategory
		android:key="connected_device_list"
		android:title="@string/connected_device_connected_title"/>
		android:title="@string/connected_device_connected_title"
		settings:controller="com.android.settings.connecteddevice.ConnectedDeviceGroupController"/>

		<com.android.settingslib.RestrictedPreference
		android:key="add_bt_devices"

src/com/android/settings/Settings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ public class Settings extends SettingsActivity {
		}
		}
		public static class WebViewAppPickerActivity extends SettingsActivity { /* empty */ }
		public static class AdvancedConnectedDeviceActivity extends SettingsActivity { /* empty */ }

		// Top level categories for new IA
		public static class NetworkDashboardActivity extends SettingsActivity {}
		@@ -163,6 +164,5 @@ public class Settings extends SettingsActivity {
		public static class StorageDashboardActivity extends SettingsActivity {}
		public static class AccountDashboardActivity extends SettingsActivity {}
		public static class SystemDashboardActivity extends SettingsActivity {}
		public static class AdvancedConnectedDeviceActivity extends SettingsActivity {}

		}

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

0 → 100644

+118 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2018 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.BluetoothProfile;
		import android.bluetooth.BluetoothAdapter;
		import android.content.Context;
		import android.media.AudioManager;
		import android.support.annotation.VisibleForTesting;
		import android.util.Log;
		import com.android.settings.connecteddevice.DevicePreferenceCallback;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settingslib.bluetooth.LocalBluetoothManager;
		import com.android.settingslib.bluetooth.CachedBluetoothDevice;

		/**
		* Controller to maintain available media Bluetooth devices
		*/
		public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater {

		private static final String TAG = "AvailableMediaBluetoothDeviceUpdater";
		private static final boolean DBG = false;

		private final AudioManager mAudioManager;

		public AvailableMediaBluetoothDeviceUpdater(Context context, DashboardFragment fragment,
		DevicePreferenceCallback devicePreferenceCallback) {
		super(context, fragment, devicePreferenceCallback);
		mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
		}

		@VisibleForTesting
		AvailableMediaBluetoothDeviceUpdater(DashboardFragment fragment,
		DevicePreferenceCallback devicePreferenceCallback,
		LocalBluetoothManager localBluetoothManager) {
		super(fragment, devicePreferenceCallback, localBluetoothManager);
		mAudioManager = (AudioManager) fragment.getContext().
		getSystemService(Context.AUDIO_SERVICE);
		}

		@Override
		public void onAudioModeChanged() {
		forceUpdate();
		}

		@Override
		public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
		if (DBG) {
		Log.d(TAG,"onConnectionStateChanged() device : " +
		cachedDevice.getName() + ", state : " + state);
		}
		if (state == BluetoothAdapter.STATE_CONNECTED) {
		if (isFilterMatched(cachedDevice)) {
		addPreference(cachedDevice);
		} else {
		removePreference(cachedDevice);
		}
		} else if (state == BluetoothAdapter.STATE_DISCONNECTED) {
		removePreference(cachedDevice);
		}
		}

		@Override
		public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {
		final int audioMode = mAudioManager.getMode();
		final int currentAudioProfile;

		if (audioMode == AudioManager.MODE_RINGTONE
		\|\| audioMode == AudioManager.MODE_IN_CALL
		\|\| audioMode == AudioManager.MODE_IN_COMMUNICATION) {
		// in phone call
		currentAudioProfile = BluetoothProfile.HEADSET;
		} else {
		// without phone call
		currentAudioProfile = BluetoothProfile.A2DP;
		}

		boolean isFilterMatched = false;
		if (isDeviceConnected(cachedDevice)) {
		if (DBG) {
		Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile);
		}
		// According to the current audio profile type,
		// this page will show the bluetooth device that have corresponding profile.
		// For example:
		// If current audio profile is a2dp, show the bluetooth device that have a2dp profile.
		// If current audio profile is headset,
		// show the bluetooth device that have headset profile.
		switch (currentAudioProfile) {
		case BluetoothProfile.A2DP:
		isFilterMatched = cachedDevice.isA2dpDevice();
		break;
		case BluetoothProfile.HEADSET:
		isFilterMatched = cachedDevice.isHfpDevice();
		break;
		}
		if (DBG) {
		Log.d(TAG, "isFilterMatched() device : " +
		cachedDevice.getName() + ", isFilterMatched : " + isFilterMatched);
		}
		}
		return isFilterMatched;
		}
		}

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

+28 −4

Original line number	Diff line number	Diff line
		@@ -28,17 +28,15 @@ import com.android.settings.connecteddevice.DevicePreferenceCallback;
		import com.android.settings.core.SubSettingLauncher;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.widget.GearPreference;
		import com.android.settingslib.bluetooth.A2dpProfile;
		import com.android.settingslib.bluetooth.BluetoothCallback;
		import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
		import com.android.settingslib.bluetooth.CachedBluetoothDevice;
		import com.android.settingslib.bluetooth.HeadsetProfile;
		import com.android.settingslib.bluetooth.LocalBluetoothManager;
		import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;

		import java.util.Collection;
		import java.util.HashMap;
		import java.util.Map;
		import java.util.Objects;

		/**
		* Update the bluetooth devices. It gets bluetooth event from {@link LocalBluetoothManager} using
		@@ -48,7 +46,8 @@ import java.util.Objects;
		* In {@link BluetoothDeviceUpdater}, it uses {@link BluetoothDeviceFilter.Filter} to detect
		* whether the {@link CachedBluetoothDevice} is relevant.
		*/
		public abstract class BluetoothDeviceUpdater implements BluetoothCallback {
		public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
		LocalBluetoothProfileManager.ServiceListener {
		private static final String TAG = "BluetoothDeviceUpdater";
		private static final String BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY =
		"persist.bluetooth.showdeviceswithoutnames";
		@@ -116,6 +115,7 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback {
		public void registerCallback() {
		mLocalManager.setForegroundActivity(mFragment.getContext());
		mLocalManager.getEventManager().registerCallback(this);
		mLocalManager.getProfileManager().addServiceListener(this);
		forceUpdate();
		}

		@@ -125,6 +125,7 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback {
		public void unregisterCallback() {
		mLocalManager.setForegroundActivity(null);
		mLocalManager.getEventManager().unregisterCallback(this);
		mLocalManager.getProfileManager().removeServiceListener(this);
		}

		/**
		@@ -175,6 +176,17 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback {
		public void onAudioModeChanged() {
		}

		@Override
		public void onServiceConnected() {
		// When bluetooth service connected update the UI
		forceUpdate();
		}

		@Override
		public void onServiceDisconnected() {

		}

		/**
		* Set the context to generate the {@link Preference}, so it could get the correct theme.
		*/
		@@ -226,4 +238,16 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback {
		mPreferenceMap.remove(device);
		}
		}

		/**
		* @return {@code true} if {@code cachedBluetoothDevice} is connected
		* and the bond state is bonded.
		*/
		public boolean isDeviceConnected(CachedBluetoothDevice cachedDevice) {
		if (cachedDevice == null) {
		return false;
		}
		final BluetoothDevice device = cachedDevice.getDevice();
		return device.getBondState() == BluetoothDevice.BOND_BONDED && device.isConnected();
		}
		}

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

+65 −5

Original line number	Diff line number	Diff line
		@@ -16,10 +16,11 @@
		package com.android.settings.bluetooth;

		import android.bluetooth.BluetoothAdapter;
		import android.bluetooth.BluetoothDevice;
		import android.bluetooth.BluetoothProfile;
		import android.content.Context;
		import android.media.AudioManager;
		import android.support.annotation.VisibleForTesting;

		import android.util.Log;
		import com.android.settings.connecteddevice.DevicePreferenceCallback;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settingslib.bluetooth.CachedBluetoothDevice;
		@@ -30,9 +31,15 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager;
		*/
		public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {

		private static final String TAG = "ConnBluetoothDeviceUpdater";
		private static final boolean DBG = false;

		private final AudioManager mAudioManager;

		public ConnectedBluetoothDeviceUpdater(Context context, DashboardFragment fragment,
		DevicePreferenceCallback devicePreferenceCallback) {
		super(context, fragment, devicePreferenceCallback);
		mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
		}

		@VisibleForTesting
		@@ -40,12 +47,28 @@ public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {
		DevicePreferenceCallback devicePreferenceCallback,
		LocalBluetoothManager localBluetoothManager) {
		super(fragment, devicePreferenceCallback, localBluetoothManager);
		mAudioManager = (AudioManager) fragment.getContext().
		getSystemService(Context.AUDIO_SERVICE);
		}

		@Override
		public void onAudioModeChanged() {
		forceUpdate();
		}

		@Override
		public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
		if (DBG) {
		Log.d(TAG,"onConnectionStateChanged() device : " +
		cachedDevice.getName() + ", state : " + state);
		}

		if (state == BluetoothAdapter.STATE_CONNECTED) {
		if (isFilterMatched(cachedDevice)) {
		addPreference(cachedDevice);
		} else {
		removePreference(cachedDevice);
		}
		} else if (state == BluetoothAdapter.STATE_DISCONNECTED) {
		removePreference(cachedDevice);
		}
		@@ -53,7 +76,44 @@ public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {

		@Override
		public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {
		final BluetoothDevice device = cachedDevice.getDevice();
		return device.getBondState() == BluetoothDevice.BOND_BONDED && device.isConnected();
		final int audioMode = mAudioManager.getMode();
		final int currentAudioProfile;

		if (audioMode == AudioManager.MODE_RINGTONE
		\|\| audioMode == AudioManager.MODE_IN_CALL
		\|\| audioMode == AudioManager.MODE_IN_COMMUNICATION) {
		// in phone call
		currentAudioProfile = BluetoothProfile.HEADSET;
		} else {
		// without phone call
		currentAudioProfile = BluetoothProfile.A2DP;
		}

		boolean isFilterMatched = false;
		if (isDeviceConnected(cachedDevice)) {
		if (DBG) {
		Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile);
		}
		// According to the current audio profile type,
		// this page will show the bluetooth device that doesn't have corresponding profile.
		// For example:
		// If current audio profile is a2dp,
		// show the bluetooth device that doesn't have a2dp profile.
		// If current audio profile is headset,
		// show the bluetooth device that doesn't have headset profile.
		switch (currentAudioProfile) {
		case BluetoothProfile.A2DP:
		isFilterMatched = !cachedDevice.isA2dpDevice();
		break;
		case BluetoothProfile.HEADSET:
		isFilterMatched = !cachedDevice.isHfpDevice();
		break;
		}
		if (DBG) {
		Log.d(TAG, "isFilterMatched() device : " +
		cachedDevice.getName() + ", isFilterMatched : " + isFilterMatched);
		}
		}
		return isFilterMatched;
		}
		}