Merge "Implement a separate controller for ring volume" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
ee56e95f90
@@ -72,6 +72,14 @@
|
||||
android:order="-160"
|
||||
settings:controller="com.android.settings.notification.RingVolumePreferenceController"/>
|
||||
|
||||
<!-- Separate Ring volume -->
|
||||
<com.android.settings.notification.VolumeSeekBarPreference
|
||||
android:key="separate_ring_volume"
|
||||
android:icon="@drawable/ic_ring_volume"
|
||||
android:title="@string/separate_ring_volume_option_title"
|
||||
android:order="-155"
|
||||
settings:controller="com.android.settings.notification.SeparateRingVolumePreferenceController"/>
|
||||
|
||||
<!-- Notification volume -->
|
||||
<com.android.settings.notification.VolumeSeekBarPreference
|
||||
android:key="notification_volume"
|
||||
@@ -88,7 +96,7 @@
|
||||
android:title="@string/alarm_volume_option_title"
|
||||
android:order="-140"
|
||||
settings:controller="com.android.settings.notification.AlarmVolumePreferenceController"/>
|
||||
x
|
||||
|
||||
<!-- TODO(b/174964721): make this a PrimarySwitchPreference -->
|
||||
<!-- Interruptions -->
|
||||
<com.android.settingslib.RestrictedPreference
|
||||
|
Reference in New Issue
Block a user