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.

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0d19a08..5bdbbf9 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2524,4 +2524,9 @@ found in the list of installed applications.</string>
 
     <!-- Name to assign to a Network Access Point that was saved without a name -->
     <string name="untitled_apn">Untitled</string>
+
+    <string name="sound_category_sound_title">General</string>
+    <string name="sound_category_calls_title">Incoming calls</string>
+    <string name="sound_category_notification_title">Notifications</string>
+    <string name="sound_category_feedback_title">Feedback</string>
 </resources>

diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index bcb49ec..23e6540 100644 (file)
--- 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>