summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Improve handling of built-in keyboard." into jb-devJeff Brown2012-05-012-32/+3
|\
| * Improve handling of built-in keyboard.Jeff Brown2012-05-012-32/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The window manager policy made some incorrect assumptions about the meaning of the Configuration.keyboard field. We need to be more careful about distinguishing between built-in and external keyboards. Most of this change is to move the determination of the parts of the Configuration related to input devices into the WindowManagerService leveraging new features of the InputManagerService to good effect. Then we plumb through the flag that indicates whether a device is internal or external so that we can be more particular about how the lid switch effects changes to the Configuration. Bug: 6424373 Change-Id: I36a1c22ade35e578955465a25940a33f227b9763
* | Revert "Add header for forward compatibility"Chris Craik2012-05-011-43/+0
|/ | | | | | GPL build fix mistakenly merged into master This reverts commit fd862e9828d544f593a622f2914d1257366ae802.
* Resample touch events on frame boundaries.Jeff Brown2012-04-272-6/+68
| | | | | Bug: 6375101 Change-Id: I8774e366306bb2b6b4e42b913525bf25b0380ec3
* Get alias for Bluetooth devices.Jeff Brown2012-04-201-6/+9
| | | | | | | | | | | Bluetooth devices can be renamed by the user. Make the input system aware of the user-specified name and transparently pass it down to applications. This enables the keyboard layout picker Settings UI to use device names that are consistent with what the user set in the Bluetooth UI. Bug: 6363157 Change-Id: I8eea26ce2c69c2a3f09c8de02e9e847610e0419c
* Improve handling of certain keyboard layout properties.Jeff Brown2012-04-181-0/+2
| | | | | | | | | | | | | | | Automatically choose a default value for the 'number' property based on the characters that the key can generate. Don't generate any character when ctrl, alt or meta is pressed unless the behavior exactly matches the modifier keys that are pressed. Simplified the basic keyboard layouts taking into account the new features. Bug: 6110399 Change-Id: Ibc0f0b50c2dcf3f962a33ac77c24d2993b77637d
* Merge "Add Dvorak keyboard layout."Jeff Brown2012-04-171-0/+9
|\
| * Add Dvorak keyboard layout.Jeff Brown2012-04-171-0/+9
| | | | | | | | | | | | | | | | | | Added support for mapping both scan codes and HID usages to KeyLayoutMap and KeyCharacterMap. Keyboard overlays can now influence how key events are mapped to key codes. Bug: 6110399 Change-Id: I6619fd2d3e1337c55928f89869dbc45b535c7ccf
* | Merge "Support loading keyboard layout overlays from resources."Jeff Brown2012-04-171-2/+27
|\ \ | |/
| * Support loading keyboard layout overlays from resources.Jeff Brown2012-04-171-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the concept of a keyboard layout overlay, which is a key character map file that has "type OVERLAY". Added support for loading keyboard layout overlays from resources dynamically. The layouts are reloaded whenever they are changed in the Settings application or an application is installed. This is somewhat more aggressive than necessary so we might want to optimize it later. Before system-ready, the input system uses just the generic keyboard layouts that are included on the device system image. After system-ready, it considers the user's selected keyboard layout overlay and attempts to load it as necessary. We need to wait until system-ready before doing this because we need to be in a state where it is safe to start applications or access their resources. Bug: 6110399 Change-Id: Iae0886d3356649b0d2440aa00910a888cedd8323
* | am a6d62b76: am 4f998a1e: am fd862e98: Add header for forward compatibilityChris Craik2012-04-171-0/+43
|\ \ | |/ |/| | | | | * commit 'a6d62b76ad8f09bd677fa115fbb71fdae2510552': Add header for forward compatibility
| * Add header for forward compatibilityChris Craik2012-04-171-0/+43
| | | | | | | | Change-Id: I6e3da852d50fc14cfb6fb50f7dd867f37daea19d
| * Update header for forward compatibilityTeng-Hui Zhu2012-04-121-0/+4
| | | | | | | | Change-Id: Idf38142dc073dce14741e8da005e7d2eaf9242de
| * Update SurfaceTexture interface for forward compatibilityTeng-Hui Zhu2012-04-101-1/+8
| | | | | | | | Change-Id: I32d224428c0127800714a976b4d7bb68cc7c2464
| * Fix hybrid buildChris Craik2012-04-031-0/+28
| | | | | | | | Change-Id: Ieef556473e1878d1319f9844fb0bbb974637999e
| * resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aospEric Laurent2012-03-161-2/+4
| |\ | | | | | | | | | Change-Id: Ia7e1cd869779e9f512e840b768f5b43992c8a122
| | * AudioTrack: relax check on minimum buffer sizeEric Laurent2012-03-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current AudioTrack implementation enforces that the requested audio buffer size is at least corresponding the audio latency. This requirement is too strong and leads to problems with current stagefright and AudioSink implementations when playing over output streams with long latency. Ultimately, the AudioSink design should be changed to specify a minimum buffer size in time or frames units but not in buffer count units. Change-Id: I8ba603956f92ac49143a8249572665aa548f2f0f Conflicts: media/libmedia/AudioTrack.cpp
| * | Add stubs for better compatibilityJean-Baptiste Queru2012-02-272-0/+34
| | | | | | | | | | | | Change-Id: I3fafee637f3ab239e3b870c73bcfe34cf73caf4c
| * | Merge "Add stubs for improved compatibility"Jean-Baptiste Queru2012-02-224-0/+68
| |\ \
| | * | Add stubs for improved compatibilityJean-Baptiste Queru2012-02-214-0/+68
| | | | | | | | | | | | | | | | Change-Id: I77b348b4c592e0b694aabb069812c94b9cb79a00
* | | | Add support for input devices that have vibrators.Jeff Brown2012-04-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a getVibrator() method to InputDevice which returns a Vibrator associated with that input device. Its uses the same API as the system vibrator which makes it easy for applications to be modified to use one or the other. Bug: 6334179 Change-Id: Ifc7f13dbcb778670f3f1c07ccc562334e6109d2e
* | | | Notify applications when input devices change.Jeff Brown2012-04-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows the InputManager to keep track of what input devices are registered with the system and when they change. It needs to do this so that it can properly clear its cache of input device properties (especially the key map!) when changes occur. Added new API so that applications can register listeners for input device changes. Fixed a minor bug in EventHub where it didn't handle EPOLLHUP properly so it would spam the log about unsupposed epoll events until inotify noticed that the device was gone and removed it. Change-Id: I937d8c601f7185d4299038bce6a2934fe4fdd2b3
* | | | Refactor key code mapping.Jeff Brown2012-04-111-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added handling for EV_MSC / MSC_SCAN which typically reports the HID usage associated with a key. This will enable key maps to map keys with HID usages that Linux does not natively recognize. Removed keyCode and flags fields from EventHub RawEvent since they don't necessarily make sense in isolation now that we pay attention to HID usage codes too. Removed the fallback code for mapping keys and axes. In practice, an input device should be self-sufficient. We should not ever need to look at the built-in keyboard's key map. In fact, there usually isn't a built-in keyboard anyhow. This code was originally working around a problem where we weren't loading the key map for touch screens with virtual keys, which has long since been fixed. Change-Id: I0a319bdec44be9514f795526347397e94d53a127
* | | | Pass width/height parameters to webviewChet Haase2012-04-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When webview draws into an fbo layer, it needs to know the size of that surface to create the rendering transform appropriately. This change copies in the current viewport size to the structure that is passed to the webview. Change-Id: I7160b0836d00834134c799c95a439cdc045e2035
* | | | Request key maps from input manager service.Jeff Brown2012-04-106-120/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of each application loading the KeyCharacterMap from the file system, get them from the input manager service as part of the InputDevice object. Refactored InputManager to be a proper singleton instead of having a bunch of static methods. InputManager now maintains a cache of all InputDevice objects that it has loaded. Currently we never invalidate the cache which can cause InputDevice to return stale motion ranges if the device is reconfigured. This will be fixed in a future change. Added a fake InputDevice with ID -1 to represent the virtual keyboard. Change-Id: If7a695839ad0972317a5aab89e9d1e42ace28eb7
* | | | Add a unique input device descriptor.Jeff Brown2012-04-061-18/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of the input device descriptor is to make it possible to associate persistent settings for each input device, such as the keyboard layout. The descriptor is a hash of the information we have about the device, such as its vendor id, product id, unique id, name, or location. Bug: 6110399 Change-Id: Idb80f946819b3f0dbf4e661bb0a753dbc2b60981
* | | | Merge "Add Japanese specific key codes."Jeff Brown2012-04-021-0/+8
|\ \ \ \
| * | | | Add Japanese specific key codes.Yang Chuang2012-04-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These keys are specific to Japanese hardware keyboard which can be used by input method. Patch ported from AOSP, with the addition of EISU and KANA mappings. Change-Id: I647473cdd257458e3b9d134b0fc623eae946c3e0
* | | | | Allow fine-grained control over functors executionRomain Guy2012-04-021-3/+14
|/ / / / | | | | | | | | | | | | | | | | | | | | Adds non-drawing execution mode Change-Id: I82f92cf1b9a3b9ff2ca6d7427c4e02b73e04e6bf
* | | | Move services/powermanager from frameworks/base to frameworks/nativeColin Cross2012-03-282-70/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move services/powermanager into frameworks/native so audioflinger can use it. Note that this is not the same as a PowerManagerService, which is part of systemserver and handles turning the screen on and off, etc. This is just a binder interface to allow taking wakelocks. Change-Id: I1142e6d9ddbb651cc19ac07d946fa24d8feed8a3
* | | | Deleted the media, camera, drm related files since they are relocatedJames Dong2012-03-28111-14177/+0
| | | | | | | | | | | | | | | | Change-Id: I9bc5573ee07e30b305b5b879023aa9ec69e10b91
* | | | Merge "Use a status_t return type for GL functors"Romain Guy2012-03-261-0/+17
|\ \ \ \
| * | | | Use a status_t return type for GL functorsRomain Guy2012-03-261-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebView needs more fine-grained control over the behavior of the framework upon execution of the display lists. The new status_t allows WebView to requests its functor to be re-executed directly without causing a redraw of the entire hierarchy. Change-Id: I97a8141dc5c6eeb6805b6024cc1e76fce07d24cc
* | | | | Merge "mv libcpustats from frameworks/base to /native"Glenn Kasten2012-03-263-220/+0
|\ \ \ \ \
| * | | | | mv libcpustats from frameworks/base to /nativeGlenn Kasten2012-03-263-220/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OK to lose history Change-Id: I05ce0452f16a396cff6e18db5424492f3a6f6861
* | | | | | Merge "Provisional support for secure decryption of media streams."Andreas Huber2012-03-268-3/+100
|\ \ \ \ \ \
| * | | | | | Provisional support for secure decryption of media streams.Andreas Huber2012-03-268-3/+100
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
* | | | | | Merge "reorganize SoundPool and JetPlayer code."Eric Laurent2012-03-261-3/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | reorganize SoundPool and JetPlayer code.Eric Laurent2012-03-261-3/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize SoundPool and JetPlayer code to be ready for the creation of libmedia_native. Split SoundPool between libsoundpool (JNI) and libmedia(sound pool implementation). Remove dependencies on nativehelper/jni.h from JetPlayer. Change-Id: I130c6014173b714329929dd82c5dfb70b757a610
* | | | | Add TRACK_FAST for IAudioFlinger::createTrackGlenn Kasten2012-03-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently not implemented by client or server Change-Id: Ib11dda57db3eeb871bcc7b546e340078776875f5
* | | | | Merge "IAudioFlinger::createTrack and openRecord flags"Glenn Kasten2012-03-262-4/+9
|\ \ \ \ \
| * | | | | IAudioFlinger::createTrack and openRecord flagsGlenn Kasten2012-03-192-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | createTrack and openRecord don't need the "old" flags parameter, which was either audio_policy_output_t or audio_in_acoustics_t shifted left by 16 bits. But they do need "new" flags, which are defined by the application use case. Initially, the only application use case flag is timed output, but others are planned. For output, the audio_policy_output_t flags are passed to AudioSystem::getOutput, which returns an audio_io_handle_t, and that handle is then passed to createTrack. So createTrack doesn't need the old flags parameter. For input, the audio_in_acoustics_t flags are passed to AudioSystem::getInput, which returns an audio_io_handle_t, and that handle is then passed to openRecord. So openRecord doesn't need the old flags parameter. Change-Id: I18a9870911846cca69d420c19fe6a9face2fe8c4
* | | | | | remove jni.h include from IOMX.hColin Cross2012-03-241-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jni.h is not used in IOMX.h and is not available in pdk builds, remove it. Change-Id: I9bc8fd70f617942712d9f684c6fc927bf18be753
* | | | | | Fixed missing return value from a method should have returned status_tJames Dong2012-03-241-1/+1
| |/ / / / |/| | | | | | | | | | | | | | Change-Id: I83ad2735eaf8a8dfa5f8f29f30aec1311b3222de
* | | | | frameworks/base: move Zip* from libandroidfw to libutilsColin Cross2012-03-224-391/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ZipUtils is needed by build/tools, move it from libandroidfw (frameworks/base) to libutils (frameworks/native). Change-Id: I2b4b7adcdf68eb25ee7cba5dd3b69eadf0523af3
* | | | | Merge "Remove enforceFrameCount"Glenn Kasten2012-03-221-2/+1
|\ \ \ \ \
| * | | | | Remove enforceFrameCountGlenn Kasten2012-03-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was only used to decide whether to issue a warning. The warning was issued the first time track was created but not at re-creation. Now it is a verbose message every time, not a warning since it happens all the time with key clicks on A2DP. Change-Id: I9d39f53c0a7eb84b666e55b1b76ff830cf8f37ba
* | | | | | Support gapless playback for mp3 and m4aMarco Nelissen2012-03-222-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gapless playback for appropriately tagged mp3 and m4a files. Currently this is implemented in OMXCodec, which most players use, but should be easy to support in other players as well by using the SkipCutBuffer utility class. Change-Id: I748c669adc1cfbe5ee9a7dea2fad945d48882551
* | | | | | Merge "Add MetaData::dumpToLog"Marco Nelissen2012-03-211-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add MetaData::dumpToLogMarco Nelissen2012-03-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Utility method for dumping the content of a MetaData object to the log. Change-Id: I2d91b991e1d9fed2215e8995a73c2b1854205074