Merge "Gets rid of dividers in sound settings" into pi-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
e6f66a3c9a
@@ -44,7 +44,6 @@
|
|||||||
android:icon="@drawable/ic_local_phone_24_lib"
|
android:icon="@drawable/ic_local_phone_24_lib"
|
||||||
android:title="@string/call_volume_option_title"
|
android:title="@string/call_volume_option_title"
|
||||||
android:order="-170"
|
android:order="-170"
|
||||||
settings:allowDividerAbove="true"
|
|
||||||
settings:controller="com.android.settings.notification.CallVolumePreferenceController"/>
|
settings:controller="com.android.settings.notification.CallVolumePreferenceController"/>
|
||||||
|
|
||||||
<!-- Hands free profile output switcher -->
|
<!-- Hands free profile output switcher -->
|
||||||
@@ -61,8 +60,7 @@
|
|||||||
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="-160"
|
android:order="-160"
|
||||||
settings:controller="com.android.settings.notification.RingVolumePreferenceController"
|
settings:controller="com.android.settings.notification.RingVolumePreferenceController"/>
|
||||||
settings:allowDividerAbove="true"/>
|
|
||||||
|
|
||||||
<!-- Also vibrate for calls -->
|
<!-- Also vibrate for calls -->
|
||||||
<SwitchPreference
|
<SwitchPreference
|
||||||
@@ -76,7 +74,6 @@
|
|||||||
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="-150"
|
android:order="-150"
|
||||||
settings:allowDividerAbove="true"
|
|
||||||
settings:controller="com.android.settings.notification.AlarmVolumePreferenceController"/>
|
settings:controller="com.android.settings.notification.AlarmVolumePreferenceController"/>
|
||||||
|
|
||||||
<!-- Notification volume -->
|
<!-- Notification volume -->
|
||||||
@@ -102,7 +99,6 @@
|
|||||||
android:title="@string/gesture_prevent_ringing_sound_title"
|
android:title="@string/gesture_prevent_ringing_sound_title"
|
||||||
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 -->
|
||||||
|
Reference in New Issue
Block a user