We go back to the old style of toggling between Mute/Vibrate/Normal. There is an addition of a checkbox to indicate Vibrate on ring/notif. Icons in volume dialogs are no longer touchable. Bug: 5586083 This simplifies the logic in SoundSettings quite a bit, since there's a 1-1 mapping with ringer mode. Don't disable volume sliders when muted, so you can go to zero and back up by sliding your finger. This is because the icons are not clickable anymore. Change-Id: Ia7ce7e1bf108419eb107f03b7720101efe1598b1
98 lines
3.7 KiB
XML
98 lines
3.7 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2008 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:title="@string/sound_settings"
|
|
android:key="sound_settings"
|
|
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
|
|
|
|
<com.android.settings.RingerVolumePreference
|
|
android:key="ring_volume"
|
|
android:title="@string/all_volume_title"
|
|
android:dialogTitle="@string/all_volume_title"
|
|
android:persistent="false"
|
|
android:streamType="ring" />
|
|
|
|
<ListPreference
|
|
android:key="silent_mode"
|
|
android:title="@string/silent_mode_title"
|
|
android:entries="@array/silent_mode_entries"
|
|
android:entryValues="@array/silent_mode_values" />
|
|
|
|
<Preference
|
|
android:key="musicfx"
|
|
android:title="@string/musicfx_title">
|
|
<intent android:targetPackage="com.android.musicfx"
|
|
android:targetClass="com.android.musicfx.ControlPanelPicker" />
|
|
</Preference>
|
|
|
|
<PreferenceCategory
|
|
android:key="category_calls_and_notification"
|
|
android:title="@string/sound_category_calls_and_notification_title"/>
|
|
|
|
<!-- Do not nest these, or removals in code will break -->
|
|
<com.android.settings.DefaultRingtonePreference
|
|
android:key="ringtone"
|
|
android:title="@string/ringtone_title"
|
|
android:dialogTitle="@string/ringtone_title"
|
|
android:persistent="false"
|
|
android:ringtoneType="ringtone" />
|
|
|
|
<com.android.settings.DefaultRingtonePreference
|
|
android:key="notification_sound"
|
|
android:title="@string/notification_sound_title"
|
|
android:dialogTitle="@string/notification_sound_dialog_title"
|
|
android:persistent="false"
|
|
android:ringtoneType="notification" />
|
|
|
|
<CheckBoxPreference
|
|
android:key="vibrate_on_ring"
|
|
android:title="@string/vibrate_on_ring_title"
|
|
android:defaultValue="false" />
|
|
|
|
<PreferenceCategory
|
|
android:title="@string/sound_category_feedback_title"/>
|
|
|
|
<!-- Do not nest these, or removals in code will break -->
|
|
|
|
<CheckBoxPreference
|
|
android:key="dtmf_tone"
|
|
android:title="@string/dtmf_tone_enable_title"
|
|
android:defaultValue="true" />
|
|
|
|
<CheckBoxPreference
|
|
android:key="sound_effects"
|
|
android:title="@string/sound_effects_enable_title"
|
|
android:defaultValue="true" />
|
|
|
|
<CheckBoxPreference
|
|
android:key="lock_sounds"
|
|
android:title="@string/lock_sounds_enable_title"
|
|
android:defaultValue="true" />
|
|
|
|
<CheckBoxPreference
|
|
android:key="haptic_feedback"
|
|
android:title="@string/haptic_feedback_enable_title"
|
|
android:defaultValue="true" />
|
|
|
|
<ListPreference
|
|
android:key="emergency_tone"
|
|
android:title="@string/emergency_tone_title"
|
|
android:entries="@array/emergency_tone_entries"
|
|
android:entryValues="@array/emergency_tone_values" />
|
|
|
|
</PreferenceScreen>
|