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.
Merge commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5' into eclair-plus-aosp
* commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5':
DO NOT MERGE A library for encoding and decoding ETC1 textures.
The widget shows the icon for a search source, and when clicked
fires an intent that shows a search source selection activity.
That intent is handled by the QuickSearchBox app.
This change also adds the source selector to the in-app
search dialog.
An upcoming change to QuickSearchBox will add the search source
selector to the home screen search widget and to the Quick Search Box
activity.
TODO: Add assets for selected and pressed states to the search selector.
TODO: The SearchDialog hides when the soruce selection activity
appears. This will be fixed when SearchDialog is changed from a
system window to a normal app window.
Change-Id: I91eadd60682577614e274ecf5b995b927c70a48a
There needs to be a way for apps to determine whether or not
a build property exists. Exposing UNKNOWN (the value that
Build sets properties to by default) will give apps something
to compare against.
Merge commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea' into eclair-plus-aosp
* commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea':
javadoc change: fix the selector sample XML in the class
Merge commit 'cffea95e1ef203223b87ae8a6bde415b25c5c415'
* commit 'cffea95e1ef203223b87ae8a6bde415b25c5c415':
Immediately close the shade when the status bar is disabled. (DO NOT MERGE)
The AudioTrack that plays the synthesized audio data should only be
started when the first synthesis request is sent, not after the
initialization of the engine.
The track volume should be initialized to it nominal level. Volumes
above 1 do not provide amplification, so setting the volume to 2 is
not necessary.
