Merge commit '967b58bed382c3b096e65e8ac7f943c12c96bdb4'
* commit '967b58bed382c3b096e65e8ac7f943c12c96bdb4':
Do not install libsampleplugin by default.
Merge commit '107621ad3120121bfd0eec59f2069995fbe27b0b' into eclair-plus-aosp
* commit '107621ad3120121bfd0eec59f2069995fbe27b0b':
Do not install libsampleplugin by default.
Merge commit '33b4efa5cbf3928cddacf3f45e596a05dc256ab3'
* commit '33b4efa5cbf3928cddacf3f45e596a05dc256ab3':
adding support for plugins to use the java view system.
Merge commit '33769eea082e0fece00f9cc16995f1edba5bfeb0' into eclair-plus-aosp
* commit '33769eea082e0fece00f9cc16995f1edba5bfeb0':
Updating samplePlugin to use java surface views.
Merge commit '3b3de83970037c9fec707dbdb06af2835b9f5913' into eclair-plus-aosp
* commit '3b3de83970037c9fec707dbdb06af2835b9f5913':
adding support for plugins to use the java view system.
Merge commit '9f742986117baf8d365b8938baec57ccf499041a'
* commit '9f742986117baf8d365b8938baec57ccf499041a':
Add backslashes before apostrophes so they don't get lost.
Merge commit '0c12e21a3152b62fb330c86b5ea544e927300608' into eclair-plus-aosp
* commit '0c12e21a3152b62fb330c86b5ea544e927300608':
Add backslashes before apostrophes so they don't get lost.
This is required by another change I am about to submit that makes it
an error not to include the backslash, since it is inevitably a mistake
when someone fails to include it.
Merge commit '83e2eae3fbb54cb284e96a8ce3f658f4dadba172'
* commit '83e2eae3fbb54cb284e96a8ce3f658f4dadba172':
Reinclude SearchableDictionary sample app as a demo of third party inclusion in Quick Search Box.
Added an example for using AlertDialog in Multichoice mode backed up by Cursor. This example can be used to test the following bug: http://code.google.com/p/android/issues/detail?id=955
AMEND:
Added a Toast to display readonly status of cursor, so data will not be updated.
Removed empty code blocks, which did nothing.
Merge commit '945b2362908e9f08e252d63f564d17c044527632'
* commit '945b2362908e9f08e252d63f564d17c044527632':
Update sample code for new service semantics.
Add new web pages for sample apps included in the SDK.
Revise the existing sample app web pages.
Delete screenshots for notepad and lunar lander (these have
moved into frameworks/base/docs/html/guide/samples/image/.
Merge commit 'e95a86cfec18836ddbff149690a13766bfc9ada3' into eclair
* commit 'e95a86cfec18836ddbff149690a13766bfc9ada3':
Fix target for ApiDemos (API is now 4)
Merge commit '978ec5abe1fe33418205d96edb8003cb4fc9a163'
* commit '978ec5abe1fe33418205d96edb8003cb4fc9a163':
Remove SearchableDictionary sample app as it is a demo of third party inclusion in quick search box.
Merge commit '3e83e8bc8b969a993b026dab9d13b99b315d9af0' into eclair
* commit '3e83e8bc8b969a993b026dab9d13b99b315d9af0':
Remove SearchableDictionary sample app as it is a demo of third party inclusion in quick search box.
At one time during the development of GLSurfaceView, the
GLSurfaceView.Renderer interface had a getConfigSpec method that was used to
select the frame buffer format. This method was removed from the
Renderer interface before GLSurfaceView became a public API, but
the sample code still defined these now-unused methods.
To reduce the chance of confusing a developer who uses the sample code,
this change removes the dead, no-longer-called getConfigSpec
implementations from the three samples.
See GLSurfaceView.setEGLConfigChooser for the replacement
technique.
Merge commit 'fab096cbcf98cb98eef25e7541121ae8e3898a10' into eclair
* commit 'fab096cbcf98cb98eef25e7541121ae8e3898a10':
new transparent icon for searchable dictionary
