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

Commit ca935c9a authored by dianlujitao's avatar dianlujitao Committed by Bruno Martins
Browse files

BT: Relocate A2DP codec strings for translation 



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

[wight554: adapted arrays for android 11]

Change-Id: I2fba6c35331175fc3432cdf1108d75f6495b4f03
Signed-off-by: default avatarVolodymyr Zhdanov <wight554@gmail.com>
parent 0218bfb6

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

+0 −4
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ 
    <item msgid="1049450003868150455">"<xliff:g id="QUALCOMM">Qualcomm®</xliff:g> <xliff:g id="APTX">aptX™</xliff:g> audio"</item>

    <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,8 +100,6 @@ 
    <item msgid="8627333814413492563">"<xliff:g id="QUALCOMM">Qualcomm®</xliff:g> <xliff:g id="APTX">aptX™</xliff:g> audio"</item>

    <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

+0 −4
Original line number Diff line number Diff line
@@ -154,8 +154,6 @@ 
        <item><xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx">aptX™</xliff:g> audio</item>

        <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. -->
@@ -178,8 +176,6 @@ 
        <item><xliff:g id="qualcomm">Qualcomm®</xliff:g> <xliff:g id="aptx">aptX™</xliff:g> audio</item>

        <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/res/values/cm_arrays.xml

0 → 100644
+44 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2020 The LineageOS 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.

*/

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

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

    <string-array name="bluetooth_a2dp_codec_titles_cm">

        <item>Use System Selection (Default)</item>

        <item>SBC</item>

        <item>AAC</item>

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

        <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>



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

    <string-array name="bluetooth_a2dp_codec_summaries_cm" >

        <item>Use System Selection (Default)</item>

        <item>SBC</item>

        <item>AAC</item>

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

        <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>

</resources>

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

+2 −1
Original line number Diff line number Diff line
@@ -341,7 +341,8 @@ public class A2dpProfile implements LocalBluetoothProfile { 
            return mContext.getString(unknownCodecId);

        }

        return mContext.getString(R.string.bluetooth_profile_a2dp_high_quality,

                mContext.getResources().getStringArray(R.array.bluetooth_a2dp_codec_titles)[index]);

                mContext.getResources().getStringArray(

                        R.array.bluetooth_a2dp_codec_titles_cm)[index]);

    }



    public String toString() {

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

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public class A2dpProfileTest { 


        final Resources res = mock(Resources.class);

        when(mContext.getResources()).thenReturn(res);

        when(res.getStringArray(eq(R.array.bluetooth_a2dp_codec_titles)))

        when(res.getStringArray(eq(R.array.bluetooth_a2dp_codec_titles_cm)))

                .thenReturn(CODEC_NAMES);



        // Most tests want to simulate optional codecs being supported by the device, so do that