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

Commit d190040d authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

Merge "Add Bluetooth Codec selection UI to the Developer Options" 

am: bfd7f9a1

Change-Id: I0cc5f64f292a56e6301b294974c1bd3cc72664c0
parents e2b4d4a3 bfd7f9a1

packages/SettingsLib/res/values/arrays.xml

+123 −0
Original line number Original line Diff line number Diff line
@@ -100,6 +100,129 @@ 
        <item>Always use HDCP checking</item>

        <item>Always use HDCP checking</item>

    </string-array>

    </string-array>







    <!-- Bluetooth settings -->



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

    <string-array name="bluetooth_a2dp_codec_titles">

        <item>Default</item>

        <item>SBC</item>

        <item>aptX</item>

        <item>aptX-HD</item>

        <item>LDAC</item>

    </string-array>



    <!-- Values for Bluetooth Audio Codec selection preference. -->

    <string-array name="bluetooth_a2dp_codec_values" translatable="false" >

        <item>1000000</item>

        <item>0</item>

        <item>1</item>

        <item>2</item>

        <item>3</item>

    </string-array>



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

    <string-array name="bluetooth_a2dp_codec_summaries" >

        <item>Default</item>

        <item>SBC</item>

        <item>aptX</item>

        <item>aptX-HD</item>

        <item>LDAC</item>

    </string-array>



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

    <string-array name="bluetooth_a2dp_codec_sample_rate_titles">

        <item>Default</item>

        <item>44.1 kHz</item>

        <item>48.0 kHz</item>

        <item>88.2 kHz</item>

        <item>96.0 kHz</item>

    </string-array>



    <!-- Values for Bluetooth Audio Codec Sample Rate selection preference. -->

    <string-array name="bluetooth_a2dp_codec_sample_rate_values" translatable="false" >

        <item>0</item>

        <item>1</item>

        <item>2</item>

        <item>4</item>

        <item>8</item>

    </string-array>



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

    <string-array name="bluetooth_a2dp_codec_sample_rate_summaries" >

        <item>Default</item>

        <item>44.1 kHz</item>

        <item>48.0 kHz</item>

        <item>88.2 kHz</item>

        <item>96.0 kHz</item>

    </string-array>



    <!-- Titles for Bluetooth Audio Codec Bits Per Sample selection preference. [CHAR LIMIT=40] -->

    <string-array name="bluetooth_a2dp_codec_bits_per_sample_titles">

        <item>Default</item>

        <item>16 bits/sample</item>

        <item>24 bits/sample</item>

        <item>32 bits/sample</item>

    </string-array>



    <!-- Values for Bluetooth Audio Codec Bits Per Sample selection preference. -->

    <string-array name="bluetooth_a2dp_codec_bits_per_sample_values" translatable="false" >

        <item>0</item>

        <item>1</item>

        <item>2</item>

        <item>4</item>

    </string-array>



    <!-- Summaries for Bluetooth Audio Codec Bits Per Sample selection preference. [CHAR LIMIT=40]-->

    <string-array name="bluetooth_a2dp_codec_bits_per_sample_summaries" >

        <item>Default</item>

        <item>16 bits/sample</item>

        <item>24 bits/sample</item>

        <item>32 bits/sample</item>

    </string-array>



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

    <string-array name="bluetooth_a2dp_codec_channel_mode_titles">

        <item>Default</item>

        <item>Mono</item>

        <item>Stereo</item>

    </string-array>



    <!-- Values for Bluetooth Audio Codec Channel Mode selection preference. -->

    <string-array name="bluetooth_a2dp_codec_channel_mode_values" translatable="false" >

        <item>0</item>

        <item>1</item>

        <item>2</item>

    </string-array>



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

    <string-array name="bluetooth_a2dp_codec_channel_mode_summaries" >

        <item>Default</item>

        <item>Mono</item>

        <item>Stereo</item>

    </string-array>



    <!-- Titles for Bluetooth Audio Codec LDAC Playback Quality selection preference. [CHAR LIMIT=40] -->

    <string-array name="bluetooth_a2dp_codec_ldac_playback_quality_titles">

        <item>Sound quality preferred (990kbps/909kbps)</item>

        <item>Standard (660kbps/606kbps)</item>

        <item>Connection preferred (330kbps/303kbps)</item>

    </string-array>



    <!-- Values for Bluetooth Audio Codec LDAC Playback Quaility selection preference. -->

    <string-array name="bluetooth_a2dp_codec_ldac_playback_quality_values" translatable="false" >

        <item>1000</item>

        <item>1001</item>

        <item>1002</item>

    </string-array>



    <!-- Summaries for Bluetooth Audio Codec LDAC Playback Quality selection preference. [CHAR LIMIT=40]-->

    <string-array name="bluetooth_a2dp_codec_ldac_playback_quality_summaries" >

        <item>Sound quality preferred (990kbps/909kbps)</item>

        <item>Standard (660kbps/606kbps)</item>

        <item>Connection preferred (330kbps/303kbps)</item>

    </string-array>



    <!-- Titles for logd limit size selection preference. [CHAR LIMIT=14] -->

    <!-- Titles for logd limit size selection preference. [CHAR LIMIT=14] -->

    <string-array name="select_logd_size_titles">

    <string-array name="select_logd_size_titles">

        <item>Off</item>

        <item>Off</item>

packages/SettingsLib/res/values/strings.xml

+25 −0
Original line number Original line Diff line number Diff line
@@ -428,6 +428,31 @@ 
    <!-- Setting Checkbox title for disabling Bluetooth absolute volume -->

    <!-- Setting Checkbox title for disabling Bluetooth absolute volume -->

    <string name="bluetooth_disable_absolute_volume">Disable absolute volume</string>

    <string name="bluetooth_disable_absolute_volume">Disable absolute volume</string>





    <!-- UI debug setting: Select Bluetooth Audio Codec -->

    <string name="bluetooth_select_a2dp_codec_type">Bluetooth Audio Codec</string>

    <!-- UI debug setting: Select Preferred Bluetooth A2DP Codec -->

    <string name="bluetooth_select_a2dp_codec_type_dialog_title">Select Preferred Bluetooth A2DP Codec</string>



    <!-- UI debug setting: Select Bluetooth Audio Sample Rate -->

    <string name="bluetooth_select_a2dp_codec_sample_rate">Bluetooth Audio Sample Rate</string>

    <!-- UI debug setting: Select Preferred Bluetooth A2DP Codec Sample Rate -->

    <string name="bluetooth_select_a2dp_codec_sample_rate_dialog_title">Select Preferred Bluetooth A2DP Codec Sample Rate</string>



    <!-- UI debug setting: Select Bluetooth Audio Bits Per Sample -->

    <string name="bluetooth_select_a2dp_codec_bits_per_sample">Bluetooth Audio Bits Per Sample</string>

    <!-- UI debug setting: Select Preferred Bluetooth A2DP Codec Bits Per Sample -->

    <string name="bluetooth_select_a2dp_codec_bits_per_sample_dialog_title">Select Preferred Bluetooth A2DP Codec Bits Per Sample</string>



    <!-- UI debug setting: Select Bluetooth Audio Channel Mode -->

    <string name="bluetooth_select_a2dp_codec_channel_mode">Bluetooth Audio Channel Mode</string>

    <!-- UI debug setting: Select Preferred Bluetooth A2DP Codec Channel Mode -->

    <string name="bluetooth_select_a2dp_codec_channel_mode_dialog_title">Select Preferred Bluetooth A2DP Codec Channel Mode</string>



    <!-- UI debug setting: Select Bluetooth Audio LDAC Playback Quality -->

    <string name="bluetooth_select_a2dp_codec_ldac_playback_quality">Bluetooth Audio LDAC Playback Quality</string>

    <!-- UI debug setting: Select Preferred Bluetooth A2DP Codec LDAC Playback Quality -->

    <string name="bluetooth_select_a2dp_codec_ldac_playback_quality_dialog_title">Select Preferred Bluetooth A2DP Codec LDAC Playback Quality</string>



    <!-- setting Checkbox summary whether to show options for wireless display certification  -->

    <!-- setting Checkbox summary whether to show options for wireless display certification  -->

    <string name="wifi_display_certification_summary">Show options for wireless display certification</string>

    <string name="wifi_display_certification_summary">Show options for wireless display certification</string>

    <!-- Setting Checkbox summary whether to enable Wifi verbose Logging [CHAR LIMIT=80] -->

    <!-- Setting Checkbox summary whether to enable Wifi verbose Logging [CHAR LIMIT=80] -->