diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-12 18:16:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-12 18:16:32 -0700 |
| commit | 8d20f6b8cb5023318a4f422778d1d4f845ac7fe4 (patch) | |
| tree | a0ad594e98a9510df068c42c16ca8ef1db4304d9 /policy | |
| parent | 5bfeeae35118720decd32043b1ecb4537645b527 (diff) | |
| parent | 40e3af61dcbf7e49979a67410f37c4b4523a0bd6 (diff) | |
| download | frameworks_base-8d20f6b8cb5023318a4f422778d1d4f845ac7fe4.zip frameworks_base-8d20f6b8cb5023318a4f422778d1d4f845ac7fe4.tar.gz frameworks_base-8d20f6b8cb5023318a4f422778d1d4f845ac7fe4.tar.bz2 | |
am 40e3af61: am 8abc9e9b: Merge "Don\'t play a sound if a volume key press is canceled." into gingerbread
Merge commit '40e3af61dcbf7e49979a67410f37c4b4523a0bd6'
* commit '40e3af61dcbf7e49979a67410f37c4b4523a0bd6':
Don't play a sound if a volume key press is canceled.
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index ca9a484..c25df1d 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -1407,18 +1407,20 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_DOWN: { - AudioManager audioManager = (AudioManager) getContext().getSystemService( - 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. - */ - audioManager.adjustSuggestedStreamVolume( - AudioManager.ADJUST_SAME, - mVolumeControlStreamType, - AudioManager.FLAG_PLAY_SOUND); - mVolumeKeyUpTime = SystemClock.uptimeMillis(); + if (!event.isCanceled()) { + AudioManager audioManager = (AudioManager) getContext().getSystemService( + 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. + */ + audioManager.adjustSuggestedStreamVolume( + AudioManager.ADJUST_SAME, + mVolumeControlStreamType, + AudioManager.FLAG_PLAY_SOUND); + mVolumeKeyUpTime = SystemClock.uptimeMillis(); + } } return true; } |