Merge commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e' into eclair-plus-aosp
* commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e':
LayoutLib: support for custom styles.
Eliminate the per-process 200ms timeout during ANR thread-dumping.
Dump all the threads at once, then wait for the file to stabilize.
Seems to work great and is much, much, much faster.
Don't dump stack traces to traces.txt on app crashes (it isn't very
useful and mostly just clutters up the file).
Tweak the formatting of the dropbox dumpsys a bit, for readability,
and avoid running out of memory when dumping large log files.
Report build & kernel version with kernel log dropbox entries.
Merge commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp
* commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e':
Don't set priority in Bonding state.
Merge commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a'
* commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a':
Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp
* commit '50a3977c619be113bb35fb7fd53874effad6dbe4':
Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
Merge commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f'
* commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f':
consolidating to only use one surface per plugin. give plugin access to java context.
Merge commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db' into eclair-mr2-plus-aosp
* commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db':
consolidating to only use one surface per plugin. give plugin access to java context.
Merge commit '90ce68a99f8803643d83be963aa0f28fa952a186'
* commit '90ce68a99f8803643d83be963aa0f28fa952a186':
DO NOT MERGE A library for encoding and decoding ETC1 textures.
Merge commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d'
* commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d':
javadoc change: fix the selector sample XML in the class
Merge commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef' into eclair-plus-aosp
* commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef':
First draft of multitouch in the WebView.
Currently we just handle a simple pinch action. We
will wait for framework support for more complicated
gesture.
When pinch in the webview, zoom level will be changed
on the fly. But we won't re-wrap the text until user
action like double tap, rotate screen.
Double tap will re-layout the page and wrap the text
to the screen width. We try to keep the spot you
tapped at the same place on the screen after relayout.
If the block after relayout fully fit on the current
screen, we will center it for easy reading.
Fix http://b/issue?id=2360032
Merge commit 'ff7d33b55b799b234f66fdcf65070ef590fee6d9'
* commit 'ff7d33b55b799b234f66fdcf65070ef590fee6d9':
Bring up IME after receiving a response from webkit.
Merge commit '04e0a1018f69b38827e63a7f19a4d1e341f9725a' into eclair-mr2-plus-aosp
* commit '04e0a1018f69b38827e63a7f19a4d1e341f9725a':
Bring up IME after receiving a response from webkit.
