Merge commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b' into gingerbread-plus-aosp
* commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b':
Import revised translations. DO NOT MERGE
Merge commit '106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp
* commit '106165b5102be226eb8049d2f7f62d7e26034e8a':
Add a RHS status bar slot for NFC.
Merge commit '457bed2bc6561dd67429dde238453fee8602fa9b' into gingerbread-plus-aosp
* commit '457bed2bc6561dd67429dde238453fee8602fa9b':
fix [3123221] Video sticks playing back upside down following orientation switch
Merge commit 'ce4d36ad729f83253d4c5ec9906148f45cc00f8e' into gingerbread-plus-aosp
* commit 'ce4d36ad729f83253d4c5ec9906148f45cc00f8e':
fix [3118445] Transform * Transform does not work as expected
Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp
* commit '17efcde161cbcbc0d98bf809036c5e640497f001':
DO NOT MERGE Fix bug 3124899 - timeout in CTS test
Merge commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd' into gingerbread-plus-aosp
* commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd':
docs: fix a couple api links
ExpandableListViewBasicTest
A certain sequence of events could cause AbsListView to enter an
infinite event loop. Only report reaching a scroll boundary to the
overscroll code path if the Scroller wants to move further, not if
we're done moving.
Change-Id: Ifdaf72d60ca25584e4a37d3d8f17365e0fcbfa40
Merge commit '89821204379816f6bee6902c4f132c014700c3b0' into gingerbread-plus-aosp
* commit '89821204379816f6bee6902c4f132c014700c3b0':
Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
Also removed call to obsolete openTagConnection() method which was crashing.
Change-Id: Iffd46bd5cad877bb3a82ede298e65ae98322dca9
Signed-off-by: Nick Pelly <npelly@google.com>
the overlay wasn't reconfigured when the screen-orientation changed. It was
only done when a parameter of the surface itself changed.
Change-Id: I0ca0925bf58ded4c91ab89d12cb1fe4d1477c96c
Merge commit '236568999411214ef440cabc6d12e3bf5f19d8f4' into gingerbread-plus-aosp
* commit '236568999411214ef440cabc6d12e3bf5f19d8f4':
Fix issue #3126018: No way to specify NativeActivity's native method
The problem wasn't in the multiply operator, but rather in the code
that built the transform from the HAL bitmask.
We now use the multiply operator to build the Transform from the bitmask,
which guarantees, it'll always be correct.
Also added a simple test for Transform.
Change-Id: I09bf3b0e51d92f59d83ea91c4cc94fc2aa0bf227
Merge commit '860c2df4132a2a0be9bcb0e91bfb7e79588c000f' into gingerbread-plus-aosp
* commit '860c2df4132a2a0be9bcb0e91bfb7e79588c000f':
Add unit tests for native input and fix bugs identified.
Merge commit '60607a9012c9b7d39bef8fcf0284772f1b061efc' into gingerbread-plus-aosp
* commit '60607a9012c9b7d39bef8fcf0284772f1b061efc':
Make sure that when the screen is off, we don't try to turn the buttons on too.
Fixed a bug where we would lose the first touch point when swiping out of
the virtual key area.
Fixed a bug where we would not send an ACTION_MOVE event in cases where
individual pointers went down/up and the remaining pointers actually moved.
This is important since many applications do not handle pointer movements
during ACTION_POINTER_DOWN or ACTION_POINTER_UP. In the case of
ACTION_POINTER_UP the movement was completely lost since all pointers were
dispatched using their old location rather than the new location.
Improved motion event validation to check for duplicate pointer ids.
Added an input source constant that was missing from the NDK api but
defined in the framework api.
Added a timestamp when reporting added/removed devices in EventHub.
Bug: 3070082
Change-Id: I3206a030f43b7616e2f48006e5a9d522c4d92e56
Merge commit 'ecae6e06a3bed9b6ab108629e4180fe55f4726ed' into gingerbread-plus-aosp
* commit 'ecae6e06a3bed9b6ab108629e4180fe55f4726ed':
Import translations for status bar.
Merge commit '07f3bee2db8b6e93ebbf7222676bd9f468e85569' into gingerbread-plus-aosp
* commit '07f3bee2db8b6e93ebbf7222676bd9f468e85569':
Push Tag/NdefTag implementation details into the service.
android_media_Visualizer.cpp:
Delete local reference to jArray in captureCallback() in
the case of waveform capture.
Change-Id: Ia822ab6d9945fff93605f7732e56120c19fd42a5
