Merge "Add recommendation setting and remove app settings" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
8e67634830
@@ -13153,18 +13153,18 @@
|
||||
|
||||
<!-- Title for media control settings [CHAR LIMIT=50]-->
|
||||
<string name="media_controls_title">Media</string>
|
||||
<!-- Summary for media control settings [CHAR LIMIT=NONE]-->
|
||||
<string name="media_controls_summary">Media player in Quick Settings</string>
|
||||
<!-- Title of toggle to enable or disable the media resumption feature in quick settings [CHAR LIMIT=50]-->
|
||||
<string name="media_controls_resume_title">Pin media player</string>
|
||||
<!-- Description of toggle to enable or disable the media resumption feature in quick settings [CHAR LIMIT=NONE]-->
|
||||
<string name="media_controls_resume_description">Show media player for an extended period to easily resume playback</string>
|
||||
<string name="media_controls_resume_description">To quickly resume playback, media player stays open in Quick Settings</string>
|
||||
<!-- Title of toggle to enable or disable media recommendations in quick settings [CHAR LIMIT=NONE] -->
|
||||
<string name="media_controls_recommendations_title">Show media recommendations</string>
|
||||
<!-- Description of toggle to enable or disable media recommendations based on user's activity [CHAR LIMIT=NONE] -->
|
||||
<string name="media_controls_recommendations_description">Based on your activity</string>
|
||||
<!-- Subtext for media settings when the player will be hidden [CHAR LIMIT=50] -->
|
||||
<string name="media_controls_hide_player">Hide player</string>
|
||||
<!-- Subtext for media settings when the player will be shown [CHAR LIMIT=50] -->
|
||||
<string name="media_controls_show_player">Show player</string>
|
||||
<!-- Subtext for media settings when no players can be shown [CHAR LIMIT=50] -->
|
||||
<string name="media_controls_no_players">No players available</string>
|
||||
<!-- Subtitle for section of media control settings that shows which apps are allowed [CHAR LIMIT=50] -->
|
||||
<string name="media_controls_apps_title">Allowed apps</string>
|
||||
<!-- Keywords for the media controls setting [CHAR LIMIT=NONE]-->
|
||||
<string name="keywords_media_controls">media</string>
|
||||
|
||||
|
@@ -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