From dcea680f2a0b6bc17b0ba332a29cb3a40cf389ca Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Thu, 11 Feb 2010 05:51:22 -0800
Subject: [PATCH] Volume settings refinements as per designer feedback.

Reduced titles, changed dialog icon, reduced padding.
---
 res/layout/preference_dialog_ringervolume.xml        | 10 +++++-----
 res/values/strings.xml                               |  8 ++++----
 src/com/android/settings/RingerVolumePreference.java |  2 ++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index e8dc7044410..f0e8328e137 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -42,7 +42,7 @@
         <SeekBar android:id="@*android:id/seekbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="6dip" 
+                android:paddingTop="2dip"
                 android:paddingLeft="20dip" 
                 android:paddingRight="20dip" />
             
@@ -57,8 +57,8 @@
         <SeekBar android:id="@+id/media_volume_seekbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="6dip" 
-                android:paddingLeft="20dip" 
+                android:paddingTop="2dip"
+                android:paddingLeft="20dip"
                 android:paddingRight="20dip" />
 
         <!-- Used for the alarm volume -->
@@ -72,7 +72,7 @@
         <SeekBar android:id="@+id/alarm_volume_seekbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="6dip" 
+                android:paddingTop="2dip"
                 android:paddingLeft="20dip" 
                 android:paddingRight="20dip" />
 
@@ -97,7 +97,7 @@
         <SeekBar android:id="@+id/notification_volume_seekbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="6dip" 
+                android:paddingTop="2dip"
                 android:paddingLeft="20dip" 
                 android:paddingRight="20dip" />
         
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 39198ef2113..4c960ecc317 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -913,20 +913,20 @@
     <!-- 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">Incoming call volume</string>
+    <string name="incoming_call_volume_title">Ringtone</string>
     <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
-    <string name="notification_volume_title">Notification volume</string>
+    <string name="notification_volume_title">Notification</string>
     <!-- Sound settings screen, the caption of the checkbox for having the notification volume be
          the same as the incoming call volume. -->
     <string name="checkbox_notification_same_as_incoming_call">Use incoming call volume for notifications</string>
     <!-- Sound settings screen, setting option title-->
     <string name="notification_sound_dialog_title">Select notification ringtone</string>
     <!-- Sound settings screen, setting option name -->
-    <string name="media_volume_title">Media volume</string>
+    <string name="media_volume_title">Media</string>
     <!-- Sound settings screen, setting option summary text -->
     <string name="media_volume_summary">Set volume for music and videos</string>
     <!-- Sound settings screen, alarm volume slider title -->
-    <string name="alarm_volume_title">Alarm volume</string>
+    <string name="alarm_volume_title">Alarm</string>
     <!-- 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 -->
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index ddadbb64ffc..7d8c30ae300 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -60,6 +60,8 @@ public class RingerVolumePreference extends VolumePreference implements
         setStreamType(AudioManager.STREAM_RING);
 
         setDialogLayoutResource(R.layout.preference_dialog_ringervolume);
+        setDialogIcon(R.drawable.ic_settings_sound);
+
         mSeekBarVolumizer = new SeekBarVolumizer[SEEKBAR_ID.length];
     }