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

Merge "Shuffle sound settings UI arrangment" into pi-dev

Browse Source 
am: c22bada88a

Change-Id: I3f02057b6c7faa902a6832f4ac8dc878e67ac786
This commit is contained in:
ryanywlin
2018-04-12 16:57:04 -07:00
committed by android-build-merger
parent fe126d116b c22bada88a
commit 7c6dbcf0fc
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
res/xml/sound_settings.xml
View File

@@ -27,55 +27,57 @@
android:key="media_volume" android:key="media_volume"
android:icon="@*android:drawable/ic_audio_media" android:icon="@*android:drawable/ic_audio_media"
android:title="@string/media_volume_option_title" android:title="@string/media_volume_option_title"
settings:controller="com.android.settings.notification.MediaVolumePreferenceController" android:order="-180"
android:order="-170"/> settings:controller="com.android.settings.notification.MediaVolumePreferenceController"/>
<!-- Alarm volume -->
<com.android.settings.notification.VolumeSeekBarPreference
android:key="alarm_volume"
android:icon="@*android:drawable/ic_audio_alarm"
android:title="@string/alarm_volume_option_title"
settings:controller="com.android.settings.notification.AlarmVolumePreferenceController"
android:order="-160"/>
<!-- Ring volume --> <!-- Ring volume -->
<com.android.settings.notification.VolumeSeekBarPreference <com.android.settings.notification.VolumeSeekBarPreference
android:key="ring_volume" android:key="ring_volume"
android:icon="@*android:drawable/ic_audio_ring_notif" android:icon="@*android:drawable/ic_audio_ring_notif"
android:title="@string/ring_volume_option_title" android:title="@string/ring_volume_option_title"
android:order="-170"
settings:controller="com.android.settings.notification.RingVolumePreferenceController" settings:controller="com.android.settings.notification.RingVolumePreferenceController"
android:order="-150"/> settings:allowDividerAbove="true"/>
<!-- Also vibrate for calls -->
<SwitchPreference
android:key="vibrate_when_ringing"
android:title="@string/vibrate_when_ringing_title"
android:order="-160"/>
<!-- Alarm volume -->
<com.android.settings.notification.VolumeSeekBarPreference
android:key="alarm_volume"
android:icon="@*android:drawable/ic_audio_alarm"
android:title="@string/alarm_volume_option_title"
android:order="-150"
settings:allowDividerAbove="true"
settings:controller="com.android.settings.notification.AlarmVolumePreferenceController"/>
<!-- Notification volume --> <!-- Notification volume -->
<com.android.settings.notification.VolumeSeekBarPreference <com.android.settings.notification.VolumeSeekBarPreference
android:key="notification_volume" android:key="notification_volume"
android:icon="@*android:drawable/ic_audio_ring_notif" android:icon="@*android:drawable/ic_audio_ring_notif"
android:title="@string/notification_volume_option_title" android:title="@string/notification_volume_option_title"
settings:controller="com.android.settings.notification.NotificationVolumePreferenceController" android:order="-140"
android:order="-140"/> settings:controller="com.android.settings.notification.NotificationVolumePreferenceController"/>
<!-- Also vibrate for calls -->
<SwitchPreference
android:key="vibrate_when_ringing"
android:title="@string/vibrate_when_ringing_title"
android:order="-130"/>
<!-- Interruptions --> <!-- Interruptions -->
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="zen_mode" android:key="zen_mode"
android:title="@string/zen_mode_settings_title" android:title="@string/zen_mode_settings_title"
android:fragment="com.android.settings.notification.ZenModeSettings"
android:order="-120"
settings:useAdminDisabledSummary="true" settings:useAdminDisabledSummary="true"
settings:keywords="@string/keywords_sounds_and_notifications_interruptions" settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
android:fragment="com.android.settings.notification.ZenModeSettings" settings:allowDividerAbove="true"/>
settings:allowDividerAbove="true"
android:order="-120"/>
<Preference <Preference
android:key="gesture_prevent_ringing_sound" android:key="gesture_prevent_ringing_sound"
android:title="@string/gesture_prevent_ringing_sound_title" android:title="@string/gesture_prevent_ringing_sound_title"
settings:allowDividerAbove="true"
android:order="-110" android:order="-110"
android:fragment="com.android.settings.gestures.PreventRingingGestureSettings" android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"
settings:allowDividerAbove="true"
settings:controller="com.android.settings.gestures.PreventRingingPreferenceController" /> settings:controller="com.android.settings.gestures.PreventRingingPreferenceController" />
<!-- Phone ringtone --> <!-- Phone ringtone -->
@@ -85,8 +87,8 @@
android:dialogTitle="@string/ringtone_title" android:dialogTitle="@string/ringtone_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:ringtoneType="ringtone" android:ringtoneType="ringtone"
settings:allowDividerAbove="true" android:order="-100"
android:order="-100"/> settings:allowDividerAbove="true"/>
<!-- Default notification ringtone --> <!-- Default notification ringtone -->
<com.android.settings.DefaultRingtonePreference <com.android.settings.DefaultRingtonePreference