Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3c3c725 authored by Vlad Popa's avatar Vlad Popa Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I72ee6be4d775a7e0443cf1f4cf3f80b84bbfcdb3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 595db293 be8b899e

res/values/strings.xml

+5 −3
Original line number Diff line number Diff line
@@ -12008,12 +12008,14 @@ 








    <!-- The title of the bluetooth audio device type selection [CHAR LIMIT=none] -->









    <string name="bluetooth_details_audio_device_types_title">Audio Device Type</string>









    <!-- The audio device type corresponding to unknown selected [CHAR LIMIT=none] -->









    <!-- The audio device type corresponding to unknown device type [CHAR LIMIT=none] -->









    <string name="bluetooth_details_audio_device_type_unknown">Unknown</string>









    <!-- The audio device type corresponding to none selected [CHAR LIMIT=none] -->









    <string name="bluetooth_details_audio_device_type_speaker">Speaker</string>









    <!-- The audio device type corresponding to speakers [CHAR LIMIT=none] -->









    <string name="bluetooth_details_audio_device_type_speaker">Speaker</string>









    <!-- The audio device type corresponding to headphones [CHAR LIMIT=none] -->









    <string name="bluetooth_details_audio_device_type_headphones">Headphones</string>









    <!-- The audio device type corresponding to hearing aid [CHAR LIMIT=none] -->









    <string name="bluetooth_details_audio_device_type_hearing_aid">Hearing Aid</string>









    <!-- The audio device type corresponding to car kit [CHAR LIMIT=none] -->









    <string name="bluetooth_details_audio_device_type_carkit">Car Kit</string>









    <!-- The audio device type corresponding to other device type [CHAR LIMIT=none] -->

























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



+3
−0






























Original line number
Diff line number
Diff line







@@ -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),









        });