am 44f9f23e: merge from open-source master

Merge commit '44f9f23ea227c62ce9250f49f5bf338cbb5f5dd7'

* commit '44f9f23ea227c62ce9250f49f5bf338cbb5f5dd7':
  Added missing media keycode (KEYCODE_MEDIA_REWIND), removed duplicate keycode (KEYCODE_MEDIA_PREVIOUS)
This commit is contained in:
The Android Open Source Project
2010-01-27 16:15:13 -08:00
committed by Android Git Automerger

View File

@@ -1647,7 +1647,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
code == KeyEvent.KEYCODE_MEDIA_STOP ||
code == KeyEvent.KEYCODE_MEDIA_NEXT ||
code == KeyEvent.KEYCODE_MEDIA_PREVIOUS ||
code == KeyEvent.KEYCODE_MEDIA_PREVIOUS ||
code == KeyEvent.KEYCODE_MEDIA_REWIND ||
code == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD) {
return true;
}