Merge commit 'eb3547b3d0678ad16a602d342cf81dc64e03d9b7' into eclair-mr2
* commit 'eb3547b3d0678ad16a602d342cf81dc64e03d9b7':
Add API demo for services that run in the foreground.
Merge commit '0431e70ddd0673ed4d9cf69d211592cb2926c076' into eclair-mr2
* commit '0431e70ddd0673ed4d9cf69d211592cb2926c076':
Remove placeholder "-" label text, that was breaking the build.
Add Live Folder support to NotePad sample, and add new icons for the app and Live Folder (separate for Donut and Eclair).
Previous change 33290 was screwed up.
Xav, please pardon a repo newbie!
Merge commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-mr2
* commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2':
docs: make the apidemos app index page only display the
Merge commit '1558abd6d3706380cf4634c151ee7952e0b317fb' into eclair
* commit '1558abd6d3706380cf4634c151ee7952e0b317fb':
docs: make the apidemos app index page only display the
shortcut links when the docs are online, because these
links will not resolve when the docs are offline.
this is a silly hack, but a temporary one until these
samples are moved.
Change-Id: I53e268db265cec143ca5e561ca2d6b4df3dba3e2
Merge commit 'e259566cef64e41a6c4228c2a80abd124e94e39c' into eclair-mr2
* commit 'e259566cef64e41a6c4228c2a80abd124e94e39c':
Put this change back, false alert with build breakage
Merge commit '42c35199db9b3ec2ec467f926538e5d748e0b49d' into eclair-mr2
* commit '42c35199db9b3ec2ec467f926538e5d748e0b49d':
Update live wallpaper examples to new api.
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 '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 '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.
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.
