Merge "Change the string of Captions and reorder the feature in audio category" into qt-dev

am: 4b7d48320c

Change-Id: I03e100ccfc9373e61d933ce948a49237f0e2fadc
This commit is contained in:
Kevin Chang
2019-05-06 21:11:22 -07:00
committed by android-build-merger
3 changed files with 82 additions and 1 deletions

View File

@@ -104,6 +104,54 @@
-->
</string-array>
<!-- List containing the order of services in screen reader category by componentname.
All componentnames in a category need to be specified to guarantee correct behavior.-->
<string-array name="config_order_screen_reader_services" translatable="false">
<!--
<item>com.example.package.first/com.example.class.FirstService</item>
<item>com.example.package.second/com.example.class.SecondService</item>
-->
</string-array>
<!-- List containing the order of services in audio and caption category by preference key
or componentname. All preference keys in a category need to be specified to guarantee
correct behavior.-->
<string-array name="config_order_audio_and_caption_services" translatable="false">
<!--
<item>com.example.package.first/com.example.class.FirstService</item>
<item>com.example.package.second/com.example.class.SecondService</item>
<item>toggle_master_mono</item>
<item>seekbar_master_balance</item>
<item>...</item>
-->
</string-array>
<!-- List containing the order of services in display category by preference key
or componentname. All preference keys in a category need to be specified to guarantee
correct behavior.-->
<string-array name="config_order_display_services" translatable="false">
<!--
<item>com.example.package.first/com.example.class.FirstService</item>
<item>com.example.package.second/com.example.class.SecondService</item>
<item>font_size_preference_screen</item>
<item>dark_ui_mode_accessibility</item>
<item>...</item>
-->
</string-array>
<!-- List containing the order of services in interaction control category by preference key
or componentname. All preference keys in a category need to be specified to guarantee
correct behavior.-->
<string-array name="config_order_interaction_control_services" translatable="false">
<!--
<item>com.example.package.first/com.example.class.FirstService</item>
<item>com.example.package.second/com.example.class.SecondService</item>
<item>autoclick_preference</item>
<item>toggle_power_button_ends_call_preference</item>
<item>...</item>
-->
</string-array>
<!-- List of packages that should be whitelisted for slice uri access. Do not translate -->
<string-array name="slice_whitelist_package_names" translatable="false"/>

View File

@@ -4808,7 +4808,7 @@
<!-- Summary for the Select to Speak Accessibility Service. [CHAR_LIMIT=none] -->
<string name="select_to_speak_summary">Tap items on your screen to hear them read aloud</string>
<!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->
<string name="accessibility_captioning_title">Captions</string>
<string name="accessibility_captioning_title">Caption preferences</string>
<!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
<string name="accessibility_screen_magnification_title">Magnification</string>
<!-- Title for the accessibility preference screen to enable triple-tap gesture screen magnification. [CHAR LIMIT=35] -->