From 9d078e984e5b73c499050dff3443622a4b595524 Mon Sep 17 00:00:00 2001
From: Eric Laurent <elaurent@google.com>
Date: Mon, 14 May 2012 14:06:23 -0700
Subject: [PATCH] Implement new volume display policy.

Whenever a stream type is muted, the progress bar in volume preference
is at 0.
If a stream is muted by ringer mode and does not control ringer mode,
the progress bar is disabled.

Change-Id: I29a5e459754f989369dc80504c18ce7ca08ed891
---
 .../android/settings/RingerVolumePreference.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index c80cd35e4b6..a79f4a59332 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -116,8 +116,8 @@ public class RingerVolumePreference extends VolumePreference {
             boolean muted = mAudioManager.isStreamMute(streamType);
 
             if (mCheckBoxes[i] != null) {
-                if (streamType == AudioManager.STREAM_RING && muted
-                        && !(mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT)) {
+                if ((streamType == AudioManager.STREAM_RING) &&
+                        (mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE)) {
                     mCheckBoxes[i].setImageResource(
                             com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);
                 } else {
@@ -126,9 +126,13 @@ public class RingerVolumePreference extends VolumePreference {
                 }
             }
             if (mSeekBars[i] != null) {
-                final int volume = muted ? mAudioManager.getLastAudibleStreamVolume(streamType)
-                        : mAudioManager.getStreamVolume(streamType);
+                final int volume = mAudioManager.getStreamVolume(streamType);
                 mSeekBars[i].setProgress(volume);
+                if (streamType != mAudioManager.getMasterStreamType() && muted) {
+                    mSeekBars[i].setEnabled(false);
+                } else {
+                    mSeekBars[i].setEnabled(true);
+                }
             }
         }
     }
@@ -169,9 +173,6 @@ public class RingerVolumePreference extends VolumePreference {
             }
         }
 
-        final int silentableStreams = System.getInt(getContext().getContentResolver(),
-                System.MODE_RINGER_STREAMS_AFFECTED,
-                ((1 << AudioSystem.STREAM_NOTIFICATION) | (1 << AudioSystem.STREAM_RING)));
         // Register callbacks for mute/unmute buttons
         for (int i = 0; i < mCheckBoxes.length; i++) {
             ImageView checkbox = (ImageView) view.findViewById(CHECKBOX_VIEW_ID[i]);