Merge "Fix volume indication in vibrate mode." into ics-mr0

Eric Laurent · Android (Google) Code Review · commit 6e91e5b689a3 · 2011-10-31T16:21:16.000-07:00
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
@@ -1635,8 +1635,10 @@ private boolean checkForRingerModeChange(int oldIndex, int direction, int stream
                     // "silent mode", but which one?
                     newRingerMode = vibeInSilent ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT;
                 }
-                if (uiIndex == 0 || (mPrevVolDirection == AudioManager.ADJUST_LOWER &&
-                        mVoiceCapable && streamType == AudioSystem.STREAM_RING)) {
+                if (uiIndex == 0 ||
+                        (!vibeInSilent &&
+                         mPrevVolDirection == AudioManager.ADJUST_LOWER &&
+                         mVoiceCapable && streamType == AudioSystem.STREAM_RING)) {
                     adjustVolumeIndex = false;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -1635,8 +1635,10 @@ private boolean checkForRingerModeChange(int oldIndex, int direction, int stream`
`1635`	`1635`	`// "silent mode", but which one?`
`1636`	`1636`	`newRingerMode = vibeInSilent ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT;`
`1637`	`1637`	`}`
`1638`		`- if (uiIndex == 0 \|\| (mPrevVolDirection == AudioManager.ADJUST_LOWER &&`
`1639`		`- mVoiceCapable && streamType == AudioSystem.STREAM_RING)) {`
	`1638`	`+ if (uiIndex == 0 \|\|`
	`1639`	`+ (!vibeInSilent &&`
	`1640`	`+ mPrevVolDirection == AudioManager.ADJUST_LOWER &&`
	`1641`	`+ mVoiceCapable && streamType == AudioSystem.STREAM_RING)) {`
`1640`	`1642`	`adjustVolumeIndex = false;`
`1641`	`1643`	`}`
`1642`	`1644`	`}`