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

Merge "Don't play a sound if a volume key press is canceled." into gingerbread

Browse Source
This commit is contained in:
Jeff Brown
2010-09-12 18:11:42 -07:00
committed by Android (Google) Code Review
parent ff38e38d05 8b7a982d29
commit 8abc9e9b99
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
policy/src/com/android/internal/policy/impl/PhoneWindow.java
View File

@@ -1317,18 +1317,20 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
switch (keyCode) { switch (keyCode) {
case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_UP:
case KeyEvent.KEYCODE_VOLUME_DOWN: { case KeyEvent.KEYCODE_VOLUME_DOWN: {
AudioManager audioManager = (AudioManager) getContext().getSystemService( if (!event.isCanceled()) {
Context.AUDIO_SERVICE); AudioManager audioManager = (AudioManager) getContext().getSystemService(
if (audioManager != null) { Context.AUDIO_SERVICE);
/* if (audioManager != null) {
* Play a sound. This is done on key up since we don't want the /*
* sound to play when a user holds down volume down to mute. * Play a sound. This is done on key up since we don't want the
*/ * sound to play when a user holds down volume down to mute.
audioManager.adjustSuggestedStreamVolume( */
AudioManager.ADJUST_SAME, audioManager.adjustSuggestedStreamVolume(
mVolumeControlStreamType, AudioManager.ADJUST_SAME,
AudioManager.FLAG_PLAY_SOUND); mVolumeControlStreamType,
mVolumeKeyUpTime = SystemClock.uptimeMillis(); AudioManager.FLAG_PLAY_SOUND);
mVolumeKeyUpTime = SystemClock.uptimeMillis();
}
} }
return true; return true;
} }