Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 967e19a4: am 2f47eaff: Merge "Volume: Only play the new vibrate hint once per volume-down." into lmp-mr1-dev

Browse Source 
* commit '967e19a402046ba771cdebe99da2488bfc1959b1':
  Volume: Only play the new vibrate hint once per volume-down.
This commit is contained in:
John Spurlock
2014-12-08 19:56:05 +00:00
committed by Android Git Automerger
parent d50390ecde 967e19a402
commit 9cfdb4f658
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/java/android/media/AudioService.java
View File

@@ -3110,11 +3110,12 @@ public class AudioService extends IAudioService.Stub {
break;
}
if ((direction == AudioManager.ADJUST_LOWER)) {
if (VOLUME_SETS_RINGER_MODE_SILENT
&& mPrevVolDirection != AudioManager.ADJUST_LOWER) {
ringerMode = RINGER_MODE_SILENT;
} else {
result |= AudioManager.FLAG_SHOW_VIBRATE_HINT;
if (mPrevVolDirection != AudioManager.ADJUST_LOWER) {
if (VOLUME_SETS_RINGER_MODE_SILENT) {
ringerMode = RINGER_MODE_SILENT;
} else {
result |= AudioManager.FLAG_SHOW_VIBRATE_HINT;
}
}
} else if (direction == AudioManager.ADJUST_RAISE) {
ringerMode = RINGER_MODE_NORMAL;