From 99d71d571835437e7a7b6928890d2e8256603735 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Fri, 29 Oct 2010 10:27:26 -0700
Subject: [PATCH] Remove extra labels from Volume settings.

Bug: 3013561
---
 res/layout/preference_dialog_ringervolume.xml    |  1 +
 .../android/settings/RingerVolumePreference.java | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index f0e8328e137..6d494c10da3 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -31,6 +31,7 @@
                 android:paddingTop="20dip" />
                 
         <TextView
+                android:id="@+id/ringtone_label"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/incoming_call_volume_title"
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 4479cb0c460..7000e4e4239 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -47,8 +47,9 @@ public class RingerVolumePreference extends VolumePreference implements
     };
 
     private static final int[] NEED_VOICE_CAPABILITY_ID = new int[] {
-            com.android.internal.R.id.seekbar, R.id.notification_volume_title,
-            R.id.notification_volume_seekbar
+            R.id.ringtone_label,
+            com.android.internal.R.id.seekbar,
+            R.id.same_notification_volume
     };
 
     private static final int[] SEEKBAR_TYPE = new int[] {
@@ -85,16 +86,17 @@ public class RingerVolumePreference extends VolumePreference implements
         mNotificationsUseRingVolumeCheckbox =
                 (CheckBox) view.findViewById(R.id.same_notification_volume);
         mNotificationsUseRingVolumeCheckbox.setOnCheckedChangeListener(this);
-        mNotificationsUseRingVolumeCheckbox.setChecked(Settings.System.getInt(
-                getContext().getContentResolver(),
-                Settings.System.NOTIFICATIONS_USE_RING_VOLUME, 1) == 1);
+        mNotificationsUseRingVolumeCheckbox.setChecked(
+                Utils.isVoiceCapable(getContext())
+                && Settings.System.getInt(
+                        getContext().getContentResolver(),
+                        Settings.System.NOTIFICATIONS_USE_RING_VOLUME, 1) == 1);
         setNotificationVolumeVisibility(!mNotificationsUseRingVolumeCheckbox.isChecked());
         disableSettingsThatNeedVoice(view);
     }
 
     private void disableSettingsThatNeedVoice(View parent) {
-        final boolean voiceCapable = getContext().getResources()
-                .getBoolean(com.android.internal.R.bool.config_voice_capable);
+        final boolean voiceCapable = Utils.isVoiceCapable(getContext());
         if (!voiceCapable) {
             for (int id : NEED_VOICE_CAPABILITY_ID) {
                 parent.findViewById(id).setVisibility(View.GONE);