Merge "[catalyst] migrate media controls settings" into main

This commit is contained in:
Michael Mikhail
2025-03-07 07:27:51 -08:00
committed by Android (Google) Code Review
15 changed files with 477 additions and 4 deletions

View File

@@ -21,14 +21,14 @@
android:title="@string/media_controls_title">
<SwitchPreferenceCompat
android:key="media_controls_resume_switch"
android:key="qs_media_resumption"
android:title="@string/media_controls_resume_title"
android:summary="@string/media_controls_resume_description"
app:keywords="@string/keywords_media_controls"
app:controller="com.android.settings.sound.MediaControlsPreferenceController" />
<SwitchPreferenceCompat
android:key="media_controls_lockscreen"
android:key="media_controls_lock_screen"
android:title="@string/media_controls_lockscreen_title"
android:summary="@string/media_controls_lockscreen_description"
app:controller="com.android.settings.sound.MediaControlsLockScreenPreferenceController" />

View File

@@ -126,7 +126,7 @@
settings:controller="com.android.settings.notification.SpatialAudioParentPreferenceController"/>
<Preference
android:key="media_controls_summary"
android:key="media_controls"
android:title="@string/media_controls_title"
android:fragment="com.android.settings.sound.MediaControlsSettings"
android:order="-100"