Merge commit '228bbae1e312c525f52648d2ff4f4ed597d82a7b' into eclair-mr2-plus-aosp
* commit '228bbae1e312c525f52648d2ff4f4ed597d82a7b':
Put this change back, false alert with build breakage
Merge commit 'e259566cef64e41a6c4228c2a80abd124e94e39c' into eclair-mr2
* commit 'e259566cef64e41a6c4228c2a80abd124e94e39c':
Put this change back, false alert with build breakage
Merge commit '81515abca85e742584db3c7cdacc5b840f0eb650' into eclair-mr2-plus-aosp
* commit '81515abca85e742584db3c7cdacc5b840f0eb650':
Update live wallpaper examples to new api.
Merge commit '42c35199db9b3ec2ec467f926538e5d748e0b49d' into eclair-mr2
* commit '42c35199db9b3ec2ec467f926538e5d748e0b49d':
Update live wallpaper examples to new api.
Merge commit '606fe5281d830a6f4eb7ba36bf7127eb3b8cd934' into eclair-mr2-plus-aosp
* commit '606fe5281d830a6f4eb7ba36bf7127eb3b8cd934':
Updating sample plugin to test java class loading.
Merge commit 'e8b11328e22d4e187e195753f1aacb59c5e30179' into eclair-mr2-plus-aosp
* commit 'e8b11328e22d4e187e195753f1aacb59c5e30179':
Fix type of _id col in SearchableDictionary
Merge commit 'f702fa413273d175ba499bcb9bd352d208621d95' into eclair-mr2
* commit 'f702fa413273d175ba499bcb9bd352d208621d95':
Fix type of _id col in SearchableDictionary
SDK SAMPLE CODE ONLY
Before, the _id column in the search suggestions contained
a string. This causes an exception when the suggestion provider
is used for in-app search in Cupcake. Now the _id column contains
a long instead.
Fixes http://b/issue?id=2219970
Change-Id: I53c8228badbb0e3ff1799107490b44ff8ced7148
Merge commit '7cb020a94773d7410e09cbc1743bfab80578f0e9' into eclair-mr2-plus-aosp
* commit '7cb020a94773d7410e09cbc1743bfab80578f0e9':
A sample application that demonstrates use of legacy and current contacts APIs.
Merge commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60' into eclair-mr2
* commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60':
A sample application that demonstrates use of legacy and current contacts APIs.
The application provides two implementations for access to contacts, one based
on legacy API, the other based on the current API. The correct implementation
is chosen at runtime based on the version of the SDK.
Change-Id: Iae0bc8564be420ff504a5dc760b935630a7664e6
Merge commit 'd22a3d977dc3e999d5ddc9409f7903ae5477ab60' into eclair-mr2-plus-aosp
* commit 'd22a3d977dc3e999d5ddc9409f7903ae5477ab60':
Revert "update demo to use boundary patch"
Merge commit '3f14f59ee679c76438f6d37bfc9535b4bc2be024' into eclair-mr2-plus-aosp
* commit '3f14f59ee679c76438f6d37bfc9535b4bc2be024':
update demo to use boundary patch
Merge commit '32739c6183d525f371c37d923a85c1150a6a1b0d' into eclair-plus-aosp
* commit '32739c6183d525f371c37d923a85c1150a6a1b0d':
Three implementations of a live wallpaper showing a spinning cube.
Merge commit '32739c6183d525f371c37d923a85c1150a6a1b0d' into eclair-mr2
* commit '32739c6183d525f371c37d923a85c1150a6a1b0d':
Three implementations of a live wallpaper showing a spinning cube.
* changes:
Three implementations of a live wallpaper showing a spinning cube. One very basic, one slightly more elaborate (selectable shape, settings panel), and one that uses renderscript.
It's annoying to have to maintain this. Remove it and understand
why we needed it in the first place. If we do, we'll generate
it when packaging the SDK rather than have it in the tree.
SDK BUG 2144477
This was added with good intentions, as part of the general drive to
provide high-res textures.
Unfortunately, most OpenGL ES drivers require that a texture's dimensions
be a power of two on each side. The original texture was 128 x 128, and
someone helpfully created a 192 x 192 high res texture. But 192 is not
a power of two, so the hihg-res texture would not render.
We could create a 256 x 256 texture, which would work, but that's not
really needed for this particular texture, and we'd prefer if the
texture stayed small for rendering performance reasons.
Merge commit '8c77415ede684d89b738b3cf6cdaeaacd541eb87' into eclair-plus-aosp
* commit '8c77415ede684d89b738b3cf6cdaeaacd541eb87':
Fix bug 2142296 where the user couldn't back out of the JetBoy demo.
The application was trapping the key up event on the back key. It
worked on Donut because the framework implemented the "back" behavior
on the key down. The fix consists in sending the key up event on the
back button to the Activity class.
