Merge commit '3003a017d312a55e3804d6cf4a80044b1f1d7993' into gingerbread-plus-aosp
* commit '3003a017d312a55e3804d6cf4a80044b1f1d7993':
Don't retain global ref to last inflated context.
Merge commit '5a54e98022d640900f94102c077d8dff447f3c76'
* commit '5a54e98022d640900f94102c077d8dff447f3c76':
Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
Merge commit '6947cc594276df899a0c4662224455f40846bd0a' into gingerbread-plus-aosp
* commit '6947cc594276df899a0c4662224455f40846bd0a':
Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
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.
Merge commit '4af0cfad5305c8827c6235ca86e7db63b534ad68' into gingerbread-plus-aosp
* commit '4af0cfad5305c8827c6235ca86e7db63b534ad68':
Verify that onPause() calls its superclass.
Merge commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583' into gingerbread-plus-aosp
* commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583':
Fix for an NPE in TextView.
Merge commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7' into gingerbread-plus-aosp
* commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7':
Some StrictMode API changes.
