PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Muting ring volume slider disables notification" into tm-qpr-dev am: 40a293fbdf am: d65e087b0d

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

Change-Id: I560670cee8bd07312766d494c4a66ef770e121cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Behnam Heydarshahi
2023-02-16 15:47:36 +00:00
committed by Automerger Merge Worker
parent d916ab4f9d d65e087b0d
commit dce497f72f
7 changed files with 121 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -6986,6 +6986,9 @@
<!-- Sound: Title for the option managing notification volume. [CHAR LIMIT=30] -->
<string name="notification_volume_option_title">Notification volume</string>
<!-- Sound: Summary for when notification volume is disabled. [CHAR LIMIT=100] -->
<string name="notification_volume_disabled_summary">Unavailable because ring is muted</string>
<!-- Sound: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->
<string name="ringtone_title">Phone ringtone</string>

4
res/xml/sound_settings.xml
View File

@@ -86,8 +86,8 @@
android:icon="@drawable/ic_notifications"
android:title="@string/notification_volume_option_title"
android:order="-150"
settings:controller=
"com.android.settings.notification.NotificationVolumePreferenceController"/>
settings:controller="com.android.settings.notification.NotificationVolumePreferenceController"
settings:unavailableSliceSubtitle="@string/notification_volume_disabled_summary"/>
<!-- Alarm volume -->
<com.android.settings.notification.VolumeSeekBarPreference