Merge commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-mr2
* commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2':
docs: make the apidemos app index page only display the
Merge commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-plus-aosp
* 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
The preview size will be checked now in Camera HAL. So, we change the code to
get the supported preview sizes and find one of the size that match the
surface's width and height.
Merge commit 'fc6e75e533d0ddbb65adb9484a1b9ee89a6246d0'
* commit 'fc6e75e533d0ddbb65adb9484a1b9ee89a6246d0':
Put this change back, false alert with build breakage
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 'e259566cef64e41a6c4228c2a80abd124e94e39c' into eclair-plus-aosp
* commit 'e259566cef64e41a6c4228c2a80abd124e94e39c':
Put this change back, false alert with build breakage
Merge commit '0badc7f8c3b3fb83d5556da8b9733b4e7b7b419a'
* commit '0badc7f8c3b3fb83d5556da8b9733b4e7b7b419a':
Update live wallpaper examples to new api.
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 '42c35199db9b3ec2ec467f926538e5d748e0b49d' into eclair-plus-aosp
* commit '42c35199db9b3ec2ec467f926538e5d748e0b49d':
Update live wallpaper examples to new api.
Merge commit 'c3e07f9d442ba097f264777693938b781e290da4'
* commit 'c3e07f9d442ba097f264777693938b781e290da4':
Updating sample plugin to test java class loading.
Merge commit 'f9e27790ebed44735b28ba23c3f95f21c6f30743'
* commit 'f9e27790ebed44735b28ba23c3f95f21c6f30743':
Fix type of _id col in SearchableDictionary
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
Merge commit 'f702fa413273d175ba499bcb9bd352d208621d95' into eclair-plus-aosp
* 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 'a883d5af0639d5f8d4dd9529665e81896221e5be'
* commit 'a883d5af0639d5f8d4dd9529665e81896221e5be':
A sample application that demonstrates use of legacy and current contacts APIs.
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.
Merge commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60' into eclair-plus-aosp
* 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
