PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add hearing aid as a BT audio type" into udc-qpr-dev am: be8b899e69

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24518074

Change-Id: I72ee6be4d775a7e0443cf1f4cf3f80b84bbfcdb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vlad Popa
2023-08-23 15:59:32 +00:00
committed by Automerger Merge Worker
parent 595db29382 be8b899e69
commit b3c3c72502
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/bluetooth/BluetoothDetailsAudioDeviceTypeController.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.bluetooth;
import static android.bluetooth.BluetoothDevice.DEVICE_TYPE_LE;
import static android.media.AudioManager.AUDIO_DEVICE_CATEGORY_CARKIT;
import static android.media.AudioManager.AUDIO_DEVICE_CATEGORY_HEADPHONES;
import static android.media.AudioManager.AUDIO_DEVICE_CATEGORY_HEARING_AID;
import static android.media.AudioManager.AUDIO_DEVICE_CATEGORY_OTHER;
import static android.media.AudioManager.AUDIO_DEVICE_CATEGORY_SPEAKER;
import static android.media.AudioManager.AUDIO_DEVICE_CATEGORY_UNKNOWN;
@@ -149,6 +150,7 @@ public class BluetoothDetailsAudioDeviceTypeController extends BluetoothDetailsC
mContext.getString(R.string.bluetooth_details_audio_device_type_speaker),
mContext.getString(R.string.bluetooth_details_audio_device_type_headphones),
mContext.getString(R.string.bluetooth_details_audio_device_type_carkit),
mContext.getString(R.string.bluetooth_details_audio_device_type_hearing_aid),
mContext.getString(R.string.bluetooth_details_audio_device_type_other),
});
mAudioDeviceTypePreference.setEntryValues(new CharSequence[]{
@@ -156,6 +158,7 @@ public class BluetoothDetailsAudioDeviceTypeController extends BluetoothDetailsC
Integer.toString(AUDIO_DEVICE_CATEGORY_SPEAKER),
Integer.toString(AUDIO_DEVICE_CATEGORY_HEADPHONES),
Integer.toString(AUDIO_DEVICE_CATEGORY_CARKIT),
Integer.toString(AUDIO_DEVICE_CATEGORY_HEARING_AID),
Integer.toString(AUDIO_DEVICE_CATEGORY_OTHER),
});