Merge "Add recommendation setting and remove app settings" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
8e67634830
@@ -20,20 +20,17 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:title="@string/media_controls_title">
|
||||
|
||||
<com.android.settings.widget.SettingsMainSwitchPreference
|
||||
<SwitchPreference
|
||||
android:key="media_controls_resume_switch"
|
||||
android:title="@string/media_controls_summary"
|
||||
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"
|
||||
app:allowDividerAbove="true" />
|
||||
app:controller="com.android.settings.sound.MediaControlsPreferenceController" />
|
||||
|
||||
<com.android.settingslib.widget.TopIntroPreference
|
||||
android:title="@string/media_controls_resume_description"
|
||||
app:searchable="false" />
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="media_controls_resumable_apps"
|
||||
android:title="@string/media_controls_apps_title"
|
||||
app:controller="com.android.settings.sound.ResumableMediaAppsController" />
|
||||
<SwitchPreference
|
||||
android:key="media_controls_recommendations"
|
||||
android:title="@string/media_controls_recommendations_title"
|
||||
android:summary="@string/media_controls_recommendations_description"
|
||||
app:controller="com.android.settings.sound.MediaControlsRecommendationController" />
|
||||
|
||||
</PreferenceScreen>
|
||||
|
Reference in New Issue
Block a user