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

Merge "Made ordering in the Sound settings page more sparse to allow injecting tiles in arbitrary positions." into pi-dev

Browse Source
This commit is contained in:
Katsiaryna Naliuka
2018-03-13 23:29:01 +00:00
committed by Android (Google) Code Review
parent ceaa6c5a0b 64a89bc9a7
commit 2ae02f56fb
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/xml/sound_settings.xml
View File

@@ -20,41 +20,41 @@
android:title="@string/sound_settings" android:title="@string/sound_settings"
android:key="sound_settings" android:key="sound_settings"
settings:keywords="@string/keywords_sounds" settings:keywords="@string/keywords_sounds"
settings:initialExpandedChildrenCount="6"> settings:initialExpandedChildrenCount="7">
<!-- Media volume --> <!-- Media volume -->
<com.android.settings.notification.VolumeSeekBarPreference <com.android.settings.notification.VolumeSeekBarPreference
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"
android:order="-106"/> android:order="-170"/>
<!-- Alarm volume --> <!-- Alarm volume -->
<com.android.settings.notification.VolumeSeekBarPreference <com.android.settings.notification.VolumeSeekBarPreference
android:key="alarm_volume" android:key="alarm_volume"
android:icon="@*android:drawable/ic_audio_alarm" android:icon="@*android:drawable/ic_audio_alarm"
android:title="@string/alarm_volume_option_title" android:title="@string/alarm_volume_option_title"
android:order="-105"/> 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="-104"/> android:order="-150"/>
<!-- 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"
android:order="-103"/> android:order="-140"/>
<!-- Also vibrate for calls --> <!-- Also vibrate for calls -->
<SwitchPreference <SwitchPreference
android:key="vibrate_when_ringing" android:key="vibrate_when_ringing"
android:title="@string/vibrate_when_ringing_title" android:title="@string/vibrate_when_ringing_title"
android:order="-102"/> android:order="-130"/>
<!-- Interruptions --> <!-- Interruptions -->
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
@@ -64,7 +64,7 @@
settings:keywords="@string/keywords_sounds_and_notifications_interruptions" settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
android:fragment="com.android.settings.notification.ZenModeSettings" android:fragment="com.android.settings.notification.ZenModeSettings"
settings:allowDividerAbove="true" settings:allowDividerAbove="true"
android:order="-101"/> android:order="-120"/>
<!-- Phone ringtone --> <!-- Phone ringtone -->
<com.android.settings.DefaultRingtonePreference <com.android.settings.DefaultRingtonePreference
@@ -83,7 +83,7 @@
android:dialogTitle="@string/notification_ringtone_title" android:dialogTitle="@string/notification_ringtone_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:ringtoneType="notification" android:ringtoneType="notification"
android:order="-99"/> android:order="-90"/>
<!-- Default alarm ringtone --> <!-- Default alarm ringtone -->
<com.android.settings.DefaultRingtonePreference <com.android.settings.DefaultRingtonePreference
@@ -93,7 +93,7 @@
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:persistent="false" android:persistent="false"
android:ringtoneType="alarm" android:ringtoneType="alarm"
android:order="-98"/> android:order="-80"/>
<!-- Other sounds --> <!-- Other sounds -->
<PreferenceCategory <PreferenceCategory