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

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

Browse Source
This commit is contained in:
John Spurlock
2014-12-08 19:36:11 +00:00
committed by Android (Google) Code Review
parent cdcabe4cd6 795a514697
commit 2f47eaff9b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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