Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bfd7f9a1f8

Browse Source 
am: d190040dd1

Change-Id: I051932a98729e91f4e6512c9fa84a7e261b8cd96
This commit is contained in:
Pavlin Radoslavov
2017-01-07 01:29:44 +00:00
committed by android-build-merger
parent 22f0b9d1ae d190040dd1
commit 8905569c67
2 changed files with 148 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
packages/SettingsLib/res/values/arrays.xml
View File

@@ -100,6 +100,129 @@
<item>Always use HDCP checking</item>
</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] -->
<string-array name="select_logd_size_titles">
<item>Off</item>

25
packages/SettingsLib/res/values/strings.xml
View File

@@ -428,6 +428,31 @@
<!-- Setting Checkbox title for disabling Bluetooth absolute volume -->
<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 -->
<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] -->