From: Eric Laurent <elaurent@google.com>
Date: Tue, 8 May 2012 00:32:49 +0000 (-0700)
Subject: Changes for new vibration policy.
X-Git-Tag: android-x86-4.4-r1~1275^2~5^3~151^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=17fe90a44038942201fbc233ed80c341397de4d7;p=android-x86%2Fpackages-apps-Settings.git

Changes for new vibration policy.

Select silent icon based on mAudioManager.getRingerMode() since AudioManager.shouldVibrate()
is deprecated.

Change-Id: Iaa474dbb8c1b5fb8fc3b6eeb3426fde3e7b879c3
---

diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 5845c8fa43..c80cd35e4b 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -117,7 +117,7 @@ public class RingerVolumePreference extends VolumePreference {
 
             if (mCheckBoxes[i] != null) {
                 if (streamType == AudioManager.STREAM_RING && muted
-                        && mAudioManager.shouldVibrate(AudioManager.VIBRATE_TYPE_RINGER)) {
+                        && !(mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT)) {
                     mCheckBoxes[i].setImageResource(
                             com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);
                 } else {