diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-04-21 18:15:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-21 18:15:38 -0700 |
| commit | 9e2810bbed6a84b9e6de3464ec855f0b6c241ef1 (patch) | |
| tree | 146d7a446aaf4603e4bd44f70aa2c8b7511fe108 /res/xml | |
| parent | 70631ab7146b149b1f221d59131fe4efe9d91ac0 (diff) | |
| parent | 19340d213c4bd4428f940a12d82a494f9e7cfaa6 (diff) | |
| download | packages_apps_settings-9e2810bbed6a84b9e6de3464ec855f0b6c241ef1.zip packages_apps_settings-9e2810bbed6a84b9e6de3464ec855f0b6c241ef1.tar.gz packages_apps_settings-9e2810bbed6a84b9e6de3464ec855f0b6c241ef1.tar.bz2 | |
am 19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyo
Merge commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6' into froyo-plus-aosp
* commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6':
Labeled categories to help clarify Sound prefs.
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/sound_settings.xml | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index bcb49ec..23e6540 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -19,6 +19,10 @@ android:key="sound_settings" xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> + <PreferenceCategory + android:title="@string/sound_category_sound_title" + > + <CheckBoxPreference android:key="silent" android:title="@string/silent_mode_title" @@ -44,6 +48,12 @@ android:order="3" android:streamType="ring" /> + </PreferenceCategory> + + <PreferenceCategory + android:title="@string/sound_category_calls_title" + > + <com.android.settings.DefaultRingtonePreference android:key="ringtone" android:title="@string/ringtone_title" @@ -61,6 +71,12 @@ android:entries="@array/vibrate_entries" android:entryValues="@array/vibrate_values" /> + </PreferenceCategory> + + <PreferenceCategory + android:title="@string/sound_category_notification_title" + > + <com.android.settings.DefaultRingtonePreference android:key="notification_sound" android:title="@string/notification_sound_title" @@ -77,6 +93,12 @@ android:order="8" android:persistent="false" /> + </PreferenceCategory> + + <PreferenceCategory + android:title="@string/sound_category_feedback_title" + > + <CheckBoxPreference android:key="dtmf_tone" android:title="@string/dtmf_tone_enable_title" @@ -116,4 +138,6 @@ android:entries="@array/emergency_tone_entries" android:entryValues="@array/emergency_tone_values" /> + </PreferenceCategory> + </PreferenceScreen> |