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

Commit 0a5e399c authored by pramod kotreshappa's avatar pramod kotreshappa Committed by Bruno Martins
Browse files

TWS-A2DP: Add TWS+ codec to DevUI support 



 Conflicts:
	core/java/android/bluetooth/BluetoothCodecConfig.java
	packages/SettingsLib/res/values-en-rGB/arrays.xml
	packages/SettingsLib/res/values/arrays.xml

Change-Id: I26ac7cc34875d01a987f00b34e43cc7fca98ef3a
CRs-Fixed: 2318635
Signed-off-by: default avatarVolodymyr Zhdanov <wight554@gmail.com>
parent 7ddab604

core/java/android/bluetooth/BluetoothCodecConfig.java

+12 −1
Original line number Diff line number Diff line
@@ -70,7 +70,16 @@ public final class BluetoothCodecConfig implements Parcelable { 
    public static final int SOURCE_CODEC_TYPE_LDAC = 5;



    @UnsupportedAppUsage

    public static final int SOURCE_CODEC_TYPE_MAX = 6;

    public static final int SOURCE_CODEC_TYPE_APTX_TWSP = 6;



    @UnsupportedAppUsage

    public static final int SOURCE_CODEC_TYPE_MAX = 7;



    /* CELT is not an A2DP Codec and only used to fetch encoder

    ** format for BA usecase, moving out of a2dp codec value list

    */

    @UnsupportedAppUsage

    public static final int SOURCE_CODEC_TYPE_CELT = 8;



    @UnsupportedAppUsage

    public static final int SOURCE_CODEC_TYPE_INVALID = 1000 * 1000;
@@ -407,6 +416,8 @@ public final class BluetoothCodecConfig implements Parcelable { 
                return "LDAC";

            case SOURCE_CODEC_TYPE_APTX_ADAPTIVE:

                return "aptX Adaptive";

            case SOURCE_CODEC_TYPE_APTX_TWSP:

                return "aptX TWS+";

            case SOURCE_CODEC_TYPE_INVALID:

                return "INVALID CODEC";

            default:

packages/SettingsLib/res/values-en-rGB/arrays.xml

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ 
    <item msgid="2908219194098827570">"<xliff:g id="QUALCOMM">Qualcomm®</xliff:g> <xliff:g id="APTX_HD">aptX™ HD</xliff:g> audio"</item>

    <item msgid="3825367753087348007">"LDAC"</item>

    <item msgid="8711430979086781450">"<xliff:g id="QUALCOMM">Qualcomm®</xliff:g> <xliff:g id="APTX_ADAPTIVE">aptX™ Adaptive</xliff:g> audio"</item>

    <item msgid="6486050771049225">"<xliff:g id="QUALCOMM">Qualcomm®</xliff:g> <xliff:g id="APTX_TWSP">aptX™ TWS+</xliff:g> audio"</item>

  </string-array>

  <string-array name="bluetooth_a2dp_codec_summaries">

    <item msgid="8868109554557331312">"Use system selection (default)"</item>
@@ -102,6 +103,7 @@ 
    <item msgid="3517061573669307965">"<xliff:g id="QUALCOMM">Qualcomm®</xliff:g> <xliff:g id="APTX_HD">aptX™ HD</xliff:g> audio"</item>

    <item msgid="2553206901068987657">"LDAC"</item>

    <item msgid="102988075927343894">"<xliff:g id="QUALCOMM">Qualcomm®</xliff:g> <xliff:g id="APTX_ADAPTIVE">aptX™ Adaptive</xliff:g> audio"</item>

    <item msgid="6486050771049481">"<xliff:g id="QUALCOMM">Qualcomm®</xliff:g> <xliff:g id="APTX_TWSP">aptX™ TWS+</xliff:g> audio"</item>

  </string-array>

  <string-array name="bluetooth_a2dp_codec_sample_rate_titles">

    <item msgid="926809261293414607">"Use system selection (default)"</item>

packages/SettingsLib/res/values/arrays.xml

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ 
        <item><xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx_hd">aptX™ HD</xliff:g> audio</item>

        <item>LDAC</item>

        <item><xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx_adaptive">aptX™ Adaptive</xliff:g> audio</item>

        <item><xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx_twsp">aptX™ TWS+</xliff:g> audio</item>

    </string-array>



    <!-- Values for Bluetooth Audio Codec selection preference. -->
@@ -176,6 +177,7 @@ 
        <item><xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx_hd">aptX™ HD</xliff:g> audio</item>

        <item>LDAC</item>

        <item><xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx_adaptive">aptX™ Adaptive</xliff:g> audio</item>

        <item><xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx_twsp">aptX™ TWS+</xliff:g> audio</item>

    </string-array>



    <!-- Titles for Bluetooth Audio Codec Sample Rate selection preference. [CHAR LIMIT=50] -->

packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java

+3 −0
Original line number Diff line number Diff line
@@ -315,6 +315,9 @@ public class A2dpProfile implements LocalBluetoothProfile { 
           case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_ADAPTIVE:

               index = 6;

               break;

           case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_TWSP:

               index = 7;

               break;

           }



        if (index < 0) {

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ public class A2dpProfileTest { 
    private static String KNOWN_CODEC_LABEL = "Use high quality audio: %1$s";

    private static String UNKNOWN_CODEC_LABEL = "Use high quality audio";

    private static String[] CODEC_NAMES =

            new String[]{"Default", "SBC", "AAC", "aptX", "aptX HD", "LDAC", "aptX Adaptive"};

            new String[]{"Default", "SBC", "AAC", "aptX", "aptX HD", "LDAC", "aptX Adaptive", "aptX TWS+"};



    /**

     * Helper for setting up several tests of getHighQualityAudioOptionLabel