Merge commit '94e939e8794727f4f74839de23c5ac5f0d9f84b3' into gingerbread-plus-aosp
* commit '94e939e8794727f4f74839de23c5ac5f0d9f84b3':
Improve Sensors documentation a bit
GetObjectPropValue and SetObjectPropValue are disabled until I figure out
why Windows doesn't like what I have done.
Change-Id: I74e945ef3ea031f6d46f4ebaa8df815da0a5c3ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'd64f4a983df4fd11795e04896d8c48852f6b1777' into gingerbread-plus-aosp
* commit 'd64f4a983df4fd11795e04896d8c48852f6b1777':
DO NOT MERGE fix null check
-> pushed functionality from AdapterViewAnimator to StackView
-> only modifying clipping flags as far up the view
hierarchy as needed
-> still need framework level solution for drawing outside bounds
ViewGroup touch dispatch temp fix
-> Touch event was being modified and not reset in some
code paths.
Change-Id: I8135b62e2d73f239b9df407b0fa93bc434796989
Rename jni call to note that, when pressing the dpad, the
cursor ring is to shown for a short time. The old name suggested
that this was tracking whether the link was followed.
Fix an unrelated change (from gingerbread, automated
merge unlikely to succeed) to check for a null
WebChromeClient.
Requires a companion change in external/webkit
http://b/2135321 (rename jni call)
http://b/2945171 (null check)
Change-Id: I9d4a92dbba1f92da8dc8cde755a2066de59514f9
Merge commit '231a0005654d23284ab58a2d9ea892b995988c34' into gingerbread-plus-aosp
* commit '231a0005654d23284ab58a2d9ea892b995988c34':
Avoid allocating buffer every time getThumbnail is called.
This change is the result of three cherry-picks:
- Add dalvik.vm.gc.preverify dalvik.vm.gc.postverify properties.
git cherry-pick --no-commit 0ef82fcf
- Add the property dalvik.vm.gc.verifycardtable to set the -Xgc:-Xgc:verifycardtable option for the vm.
git cherry-pick --no-commit 8b4faf54
- Eliminate short JIT debugging properties
git cherry-pick --no-commit 57a673fc3db9d84908467ae6d245fd60d4637b2f
Change-Id: I5f8002ed1e431344570add02f58e2641c8fae549
Merge commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab' into gingerbread-plus-aosp
* commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab':
Fix the test breakage in vCard tests.
- Make custom resolvers use official MockContentProvider instead of
relying on its own.
- Fix a test which is found to be broken after the fix above.
Bug: 2945326
Change-Id: Ifb14f61771215c103d8825240989eecee73d585a
Introduces simple_selectable_list_item for new Holo theme list selection.
Also fixes bug http://b/issue?id=2942491 for colors.
Change-Id: I966a4f612a784557797bfa76bae019b2515724f2
Merge commit '4af0cfad5305c8827c6235ca86e7db63b534ad68' into gingerbread-plus-aosp
* commit '4af0cfad5305c8827c6235ca86e7db63b534ad68':
Verify that onPause() calls its superclass.
