Merge "Sound settings screen and volumes dialog reconfiguration."

3 files changed, 140 insertions, 126 deletions

diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index 5aebedc..4944f91 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -32,34 +32,36 @@
                 android:paddingTop="20dip"
                 android:visibility="gone"/>
 
-        <TextView
-                android:id="@+id/ringtone_label"
-                android:layout_width="match_parent"
+        <!-- Dummy -->
+        <SeekBar android:id="@*android:id/seekbar"
+                android:layout_width="0dip"
                 android:layout_height="wrap_content"
-                android:text="@string/incoming_call_volume_title"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
+                android:layout_weight="1"
+                android:visibility="gone" />
 
-        <!-- Used for the ring volume.  This is what the superclass VolumePreference uses. -->
-        <!-- TODO - is this used? -->
-        <SeekBar android:id="@*android:id/seekbar"
-                android:layout_width="match_parent"
+        <TextView
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingTop="2dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
+                android:paddingLeft="16dip"
+                android:layout_gravity="left"
+                android:text="@string/volume_media_description"
+            />
 
         <!-- Used for the media volume -->
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:paddingLeft="8dip"
                 android:orientation="horizontal"
                 android:gravity="center_vertical">
 
-                <ImageView android:id="@+id/volume_mute_button"
+                <ImageView android:id="@+id/media_mute_button"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
+                        android:layout_height="wrap_content"
+                        android:padding="8dip"
+                        android:background="?android:attr/selectableItemBackground"
+                    />
 
                 <SeekBar android:id="@+id/media_volume_seekbar"
                         android:layout_width="0dip"
@@ -70,61 +72,119 @@
                         android:paddingRight="20dip" />
         </LinearLayout>
 
-        <!-- TODO - is this used? -->
-        <CheckBox android:id="@+id/same_notification_volume"
+        <!-- Used for the ringer/notification volume -->
+        <LinearLayout
+                android:id="@+id/ringer_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/checkbox_notification_same_as_incoming_call"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_marginTop="6dip"
-                android:layout_marginLeft="20dip"
-                android:layout_marginRight="20dip" />
+                android:orientation="vertical">
+
+            <TextView
+                    android:id="@+id/ringer_description_text"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dip"
+                    android:paddingLeft="16dip"
+                    android:layout_gravity="left"
+                    android:text="@string/volume_ring_description"
+                />
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="8dip"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical">
+
+                    <ImageView android:id="@+id/ringer_mute_button"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:padding="8dip"
+                            android:background="?android:attr/selectableItemBackground"
+                        />
+
+                    <SeekBar android:id="@+id/ringer_volume_seekbar"
+                            android:layout_width="0dip"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:paddingTop="2dip"
+                            android:paddingLeft="20dip"
+                            android:paddingRight="20dip" />
+            </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="#1bffffff"
-            android:layout_marginTop="16dip"
-            android:layout_marginBottom="16dip"/>
+        </LinearLayout>
 
         <!-- Used for the notification volume -->
         <LinearLayout
+                android:id="@+id/notification_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:orientation="vertical">
+
+            <TextView
+                    android:id="@+id/notification_description_text"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dip"
+                    android:paddingLeft="16dip"
+                    android:layout_gravity="left"
+                    android:text="@string/volume_notification_description"
+                />
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="8dip"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical">
+
+                    <ImageView android:id="@+id/notification_mute_button"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:padding="8dip"
+                            android:background="?android:attr/selectableItemBackground"
+                        />
+
+                    <SeekBar android:id="@+id/notification_volume_seekbar"
+                            android:layout_width="0dip"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:paddingTop="2dip"
+                            android:paddingLeft="20dip"
+                            android:paddingRight="20dip" />
+            </LinearLayout>
 
-                <ImageView android:id="@+id/notification_mute_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
-
-                <SeekBar android:id="@+id/notification_volume_seekbar"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="2dip"
-                        android:paddingLeft="20dip"
-                        android:paddingRight="20dip" />
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="#1bffffff"
-            android:layout_marginTop="16dip"
-            android:layout_marginBottom="16dip"/>
+        <TextView
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dip"
+                android:paddingLeft="16dip"
+                android:layout_gravity="left"
+                android:text="@string/volume_alarm_description"
+            />
 
         <!-- Used for the alarm volume -->
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:paddingLeft="8dip"
                 android:orientation="horizontal">
 
                 <ImageView android:id="@+id/alarm_mute_button"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
-
+                        android:layout_height="wrap_content"
+                        android:padding="8dip"
+                        android:background="?android:attr/selectableItemBackground"
+                    />
                 <SeekBar android:id="@+id/alarm_volume_seekbar"
-                        android:layout_width="match_parent"
+                        android:layout_width="0dip"
                         android:layout_height="wrap_content"
+                        android:layout_weight="1"
                         android:paddingTop="2dip"
                         android:paddingLeft="20dip"
                         android:paddingRight="20dip" />
@@ -132,4 +192,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7c4c6de..638f4c1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1399,38 +1399,24 @@
     <string name="sound_settings">Sound</string>
     <!-- Sound settings screen, setting option name checkbox -->
     <string name="silent_mode_title">Silent mode</string>
-    <!-- Sound settings screen, setting option summary text when going into silent mode.  Media and alarms sounds WILL NOT be silenced in silent mode. -->
-    <string name="silent_mode_summary">Silence all sounds except media &amp; alarms</string>
-    <!-- Sound settings screen, setting option summary text when going into silent mode.  Media WILL NOT be silenced in silent mode, but alarms WILL be silenced. -->
-    <string name="silent_mode_incl_alarm_summary">All sounds except media are silenced</string>
     <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-    <string name="ringtone_title">Incoming call ringtone</string>
+    <string name="ringtone_title">Phone ringtone</string>
     <!-- Sound settings screen, setting option summary text -->
     <string name="ringtone_summary">""</string>
     <!-- Sound settings screen, volume title -->
-    <string name="all_volume_title">Volume</string>
+    <string name="all_volume_title">Volumes</string>
     <!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
     <string name="musicfx_title">Music Effects</string>
     <!-- Sound settings screen, setting option name -->
     <string name="ring_volume_title">Ringer volume</string>
-    <!-- Sound settings screen, setting option summary text -->
-    <string name="ring_volume_summary">""</string>
     <!-- Sound settings screen, setting option name checkbox -->
     <string name="vibrate_in_silent_title">Vibrate when silent</string>
-    <!-- Sound settings screen, setting option summary text -->
-    <string name="vibrate_in_silent_summary">Allow vibration feedback in silent mode</string>
     <!-- Sound settings screen, setting option name checkbox -->
     <string name="vibrate_title">Vibrate</string>
-    <!-- Sound settings screen, setting option summary text -->
-    <string name="vibrate_summary">Vibration feedback for calls and notifications</string>
     <!-- Sound settings screen, setting option name -->
-    <string name="notification_sound_title">Notification ringtone</string>
-    <!-- Sound settings screen, setting option summary text -->
-    <string name="notification_sound_summary">""</string>
+    <string name="notification_sound_title">Default notification</string>
     <!-- Sound settings screen, notification light repeat pulsing title -->
     <string name="notification_pulse_title">Pulse notification light</string>
-    <!-- Sound settings screen, notification light repeat pulsing summary -->
-    <string name="notification_pulse_summary">Pulse trackball light repeatedly for new notifications</string>
     <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
     <string name="incoming_call_volume_title">Ringtone</string>
     <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
@@ -1449,33 +1435,23 @@
     <!-- Sound settings screen, dock settings summary-->
     <string name="dock_settings_summary">Audio settings for the attached dock</string>
     <!-- Sound settings screen, setting check box label -->
-    <string name="dtmf_tone_enable_title">Audible touch tones</string>
-    <!-- Sound settings screen, setting option summary text when check box is selected -->
-    <string name="dtmf_tone_enable_summary_on">Play tones when using dial pad</string>
-    <!-- Sound settings screen, setting option summary text when check box is clear -->
-    <string name="dtmf_tone_enable_summary_off">Play tones when using dial pad</string>
+    <string name="dtmf_tone_enable_title">Dial pad touch tones</string>
     <!-- Sound settings screen, setting check box label -->
-    <string name="sound_effects_enable_title">Audible selection</string>
-    <!-- Sound settings screen, setting option summary text when check box is selected -->
-    <string name="sound_effects_enable_summary_on">Play sound when making screen selection</string>
-    <!-- Sound settings screen, setting option summary text when check box is clear -->
-    <string name="sound_effects_enable_summary_off">Play sound when making screen selection</string>
+    <string name="sound_effects_enable_title">Touch sounds</string>
     <!-- Sound settings screen, setting check box label -->
-    <string name="lock_sounds_enable_title">Screen lock sounds</string>
-    <!-- Sound settings screen, setting option summary text when check box is selected -->
-    <string name="lock_sounds_enable_summary_on">Play sounds when locking and unlocking the screen</string>
-    <!-- Sound settings screen, setting option summary text when check box is clear -->
-    <string name="lock_sounds_enable_summary_off">Play sounds when locking and unlocking the screen</string>
+    <string name="lock_sounds_enable_title">Screen lock sound</string>
     <!-- Sound settings screen, setting check box label -->
-    <string name="haptic_feedback_enable_title">Haptic feedback</string>
-    <!-- Sound settings screen, setting option summary text when check box is selected -->
-    <string name="haptic_feedback_enable_summary_on">Vibrate when pressing soft keys and on certain UI interactions</string>
-    <!-- Sound settings screen, setting option summary text when check box is clear -->
-    <string name="haptic_feedback_enable_summary_off">Vibrate when pressing soft keys and on certain UI interactions</string>
+    <string name="haptic_feedback_enable_title">Vibrate on touch</string>
     <!-- Sound settings screen, setting option name checkbox to enable/disable audio recording features that improve audio recording in noisy environments -->
     <string name="audio_record_proc_title">Noise cancellation</string>
-    <!-- Sound settings screen, setting option summary text -->
-    <string name="audio_record_proc_summary">Suppress background noise when speaking or recording.</string>
+    <!-- Volume description for media volume -->
+    <string name="volume_media_description">Music, video, games &amp; other media</string>
+    <!-- Volume description for ringtone and notification volume -->
+    <string name="volume_ring_description">Ringtone &amp; notifications</string>
+    <!-- Volume description for notification volume -->
+    <string name="volume_notification_description">Notifications</string>
+    <!-- Volume description for alarm volume -->
+    <string name="volume_alarm_description">Alarms</string>
 
     <!-- Dock settings title, top level -->
     <string name="dock_settings">Dock</string>
@@ -3120,9 +3096,9 @@ found in the list of installed applications.</string>
     <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_calls_and_notification_title">Ringtone &amp; notifications</string>
     <string name="sound_category_notification_title">Notifications</string>
-    <string name="sound_category_feedback_title">Feedback</string>
+    <string name="sound_category_feedback_title">System</string>
 
     <!-- Wifi Setup For Setup Wizard with XL screen -->
     <!-- Title shown in Wifi Setup Wizard with XL screen -->
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index ecc4af2..c0bca2e 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -19,15 +19,13 @@
         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"
-            android:summary="@string/silent_mode_summary"
+    <com.android.settings.RingerVolumePreference
+            android:key="ring_volume"
+            android:dependency="silent"
+            android:title="@string/all_volume_title"
+            android:dialogTitle="@string/all_volume_title"
             android:persistent="false"
-            android:disableDependentsState="true" />
+            android:streamType="ring" />
 
     <ListPreference
             android:key="vibrate"
@@ -36,14 +34,11 @@
             android:entries="@array/vibrate_entries"
             android:entryValues="@array/vibrate_values" />
 
-    <com.android.settings.RingerVolumePreference
-            android:key="ring_volume"
-            android:dependency="silent"
-            android:title="@string/all_volume_title"
-            android:summary="@string/ring_volume_summary"
-            android:dialogTitle="@string/all_volume_title"
+    <CheckBoxPreference
+            android:key="silent"
+            android:title="@string/silent_mode_title"
             android:persistent="false"
-            android:streamType="ring" />
+            android:disableDependentsState="true" />
 
     <Preference
             android:key="musicfx"
@@ -53,27 +48,20 @@
     </Preference>
 
     <PreferenceCategory
-            android:key="category_calls"
-            android:title="@string/sound_category_calls_title"/>
+            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:summary="@string/ringtone_summary"
             android:dialogTitle="@string/ringtone_title"
             android:persistent="false"
             android:ringtoneType="ringtone" />
 
-    <PreferenceCategory
-            android:key="category_notification"
-            android:title="@string/sound_category_notification_title"/>
-
-    <!-- Do not nest these, or removals in code will break -->
-
     <com.android.settings.DefaultRingtonePreference
             android:key="notification_sound"
             android:title="@string/notification_sound_title"
-            android:summary="@string/notification_sound_summary"
             android:dialogTitle="@string/notification_sound_dialog_title"
             android:persistent="false"
             android:ringtoneType="notification" />
@@ -81,7 +69,6 @@
     <CheckBoxPreference
             android:key="notification_pulse"
             android:title="@string/notification_pulse_title"
-            android:summary="@string/notification_pulse_summary"
             android:persistent="false" />
 
     <PreferenceCategory
@@ -92,35 +79,26 @@
     <CheckBoxPreference
             android:key="dtmf_tone"
             android:title="@string/dtmf_tone_enable_title"
-            android:summaryOn="@string/dtmf_tone_enable_summary_on"
-            android:summaryOff="@string/dtmf_tone_enable_summary_off"
             android:defaultValue="true" />
 
     <CheckBoxPreference
             android:key="sound_effects"
             android:title="@string/sound_effects_enable_title"
-            android:summaryOn="@string/sound_effects_enable_summary_on"
-            android:summaryOff="@string/sound_effects_enable_summary_off"
             android:defaultValue="true" />
 
     <CheckBoxPreference
             android:key="lock_sounds"
             android:title="@string/lock_sounds_enable_title"
-            android:summaryOn="@string/lock_sounds_enable_summary_on"
-            android:summaryOff="@string/lock_sounds_enable_summary_off"
             android:defaultValue="true" />
 
     <CheckBoxPreference
             android:key="haptic_feedback"
             android:title="@string/haptic_feedback_enable_title"
-            android:summaryOn="@string/haptic_feedback_enable_summary_on"
-            android:summaryOff="@string/haptic_feedback_enable_summary_off"
             android:defaultValue="true" />
 
     <ListPreference
             android:key="emergency_tone"
             android:title="@string/emergency_tone_title"
-            android:summary="@string/emergency_tone_summary"
             android:entries="@array/emergency_tone_entries"
             android:entryValues="@array/emergency_tone_values" />