Merge commit '61f1cbdd71942433ce1515b614ec3d9c259ea037'
* commit '61f1cbdd71942433ce1515b614ec3d9c259ea037':
Adding a feature definition corresponding to support for Near-Field
Merge commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp
* commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b':
Adding a feature definition corresponding to support for Near-Field
The get/set for the pluginPath is leftover from the Gear's plugin
and is no longer useful now that plugins are loaded from their
own APK using the package manager. These methods were modified to
be no-ops in froyo, but the documentation was never completed.
Change-Id: I20f6593445d877a3dae9b9f51d5198a3509255d6
http://b/2811032
Add DRM Framework to support DRM content playback
together with StageFright.
- DRM Framework code is added
- include/drm
- drm
- api/current.xml is updated to include DRM Framework Java APIs
- cmds/servicemanager/service_manager.c is modified
to add drmManager and drmIOService.
Change-Id: I6d7bc9c7067362b500e530988a9ce241761866fb
Merge commit 'ec438e1448ebc578ee5a4c4beb1e26292cdedd6e'
* commit 'ec438e1448ebc578ee5a4c4beb1e26292cdedd6e':
Add PackageManager API to get information about a provider component.
Merge commit '361199b5e742c6635d4d7a03de6cf37b31cf442c' into gingerbread-plus-aosp
* commit '361199b5e742c6635d4d7a03de6cf37b31cf442c':
Add PackageManager API to get information about a provider component.
Merge commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c'
* commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c':
fix the build. will revisit this change in a minute
Merge commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68' into gingerbread-plus-aosp
* commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68':
New edge effects for scrolling widgets (overscroll)
TODO: Currently disabled for WebView. Assets used for the glow effect
need to be themable/styleable. Overscroll effect should take place
even when the user did not grab the widget within actual content.
Change-Id: I68277d14d37dc5bcdb9254eaddf6e4998b3f2bf4
Finished the input device capability API.
Added a mechanism for calibrating touch devices to obtain more
accurate information about the touch contact area.
Improved pointer location to show new coordinates and capabilities.
Optimized pointer location display and formatting to avoid allocating large
numbers of temporary objects. The GC churn was causing the application to
stutter very badly when more than a couple of fingers were down).
Added more diagnostics.
Change-Id: Ie25380278ed6f16c5b04cd9df848015850383498
Also removes the artifical restriction that only one apply() can be in
flight at once. That was old from when I thought it'd end up being
required, but wasn't.
Change-Id: I3540ea8be6e0760d6a51d218186f71655c2f3f55
Merge commit '705c2e66dcb358c865cf912a5496825088044b79'
* commit '705c2e66dcb358c865cf912a5496825088044b79':
Unhide camera fps range API and deprecate old ones.
Merge commit '15665bb60eb2ca8d114724379c156ff7f2a6cc53' into gingerbread-plus-aosp
* commit '15665bb60eb2ca8d114724379c156ff7f2a6cc53':
Add current.xml API file missing from I8f2b6b79.
Merge commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2' into gingerbread-plus-aosp
* commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2':
Unhide camera fps range API and deprecate old ones.
Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.
Change-Id: I1233a22ed64d42f167432085716bb6bfc3d36bbf
Merge commit '4b4114d155b4f3d5cc4179934cb6403b1776261d'
* commit '4b4114d155b4f3d5cc4179934cb6403b1776261d':
Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText()
- Rename ClippedData to ClipData.
- Introudce ClipDescription subclass.
- Add convenience APIs for creating a ClipData.
- Add ClipboardManager API to get just the ClipDescription.
- Define MIME types associated with a clip.
Change-Id: If97ef91aa99a4dd0ec74ccaea504345c9ef12b5c
Turns out we need more ContactsContract APIs to
be unhidden in order to support unbundled directories.
Change-Id: If212e769bb32cd6806e39217935d189f9d43ea67
Merge commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4' into gingerbread-plus-aosp
* commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4':
DO NOT MERGE Text selection: tapping on selection opens context menu
Back key exit selection mode. No more "Stop selecting text" in second context menu.
A tap on one of the handles also triggers the second context menu.
Paste is only available on long press in first menu for empty text fields.
Change-Id: Ic4fa00458d4f617a81885436b53d4fc923347609
