Merge "[CDM] Add Permissions Sync toggle" into udc-qpr-dev am: d43d6f259a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24708184

Change-Id: I3c29e5b9a46695e5c21a837e00891cc22e0bff4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Guojing Yuan
2023-09-15 21:49:46 +00:00
committed by Automerger Merge Worker
5 changed files with 276 additions and 0 deletions

View File

@@ -12034,6 +12034,11 @@
<!-- The summary of the head tracking [CHAR LIMIT=none] -->
<string name="bluetooth_details_head_tracking_summary">Audio changes as you move your head to sound more natural</string>
<!-- The title of CDM Permissions Sync -->
<string name="bluetooth_details_permissions_sync_title">Sync permissions</string>
<!-- The summary of CDM Permissions Sync -->
<string name="bluetooth_details_permissions_sync_summary">Give <xliff:g id="remote_device_name" example="Pixel Watch">%1$s</xliff:g> the same app permissions that youve allowed on <xliff:g id="local_device_name" example="Pixel 6">%2$s</xliff:g></string>
<!-- The title of the bluetooth audio device type selection [CHAR LIMIT=none] -->
<string name="bluetooth_details_audio_device_types_title">Audio Device Type</string>
<!-- The audio device type corresponding to unknown device type [CHAR LIMIT=none] -->

View File

@@ -92,6 +92,9 @@
settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>
</PreferenceCategory>
<PreferenceCategory
android:key="data_sync_group"/>
<Preference
android:key="keyboard_settings"
android:persistent="false"