Merge branch 'master' into honeycomb-release
Ensure default card matrix is set before creating cards.

Change-Id: I3fd55a3332f319c2a3a7a9c9f1a1351e48c0d178
Merge branch 'master' into honeycomb-release
DO NOT MERGE:Changes in master, which did not make it into GB

The original change simply added 3 extra constants to be used for logging
information related to alternative word selection from the n-best list
which is returned for voice ime recognition results
Bug: 3243768
Change-Id: Ib01184901c7b4a50235877664993d26940cfe43c
Fix: don't change values of constants

I shouldnt have renamed length -> mlength. This reverts that mistake.

Change-Id: I92eff11b395933912d4010a3e9b996f7b47cf756
Tap to stop the carousel

When the carousel is moving faster than 15 degrees per
second, a tap will stop the motion but not be interpreted
as a selection. Slower than that, it will be considered a
selection.

This is an improvement on an earlier implementation because
it lets through selections when the carousel is still
moving slowly.

Bug: 3179984
Change-Id: I27b55cf88e20d4ef1383ec0e4144f65a101f37fc
Merge branch 'master' into honeycomb-release
Enable invalidation of carousel textures.

Mirrors existing implementation of detail texture invalidation.  Also
fixes issue where eraseCurrent was being ignored.

Fixes http://b/3246908.

Change-Id: I7348536b43b1ccf6b7df2389a1100c3d5b1671a8
Merge branch 'master' into honeycomb-release
Exit overscroll mode when the user interacts with the carousel.

This ensure that when the user releases the carousel, we don't
automatically revert to overscroll mode unless we're still in
the overscroll area.

Change-Id: I1cec3380452383e2ba70b1dfab540a53e8289838
Update to API cleanup

Change-Id: I3b5add1a98f10ca47cf26c004f8ca4f3353da1f8
Merge branch 'master' into honeycomb-release
Add more feedback parameters to onCardLongPress

onCardLongPress now passes information about the detail
texture being passed, and where the touch happened.

Also fixing a bug that caused long-press to be interpreted
as selection.

Change-Id: I4ee189c7c006abbc6ad71ac60778d1f18e8684a2
Merge branch 'master' into honeycomb-release
Use ids rather than Meshes when specifying default / loading geometries.

This allows them to be reloaded when required, thus fixing
http:/b/3237395

Change-Id: I9eea73d85a8c272debbfb45d5577ded185cf8112
Merge branch 'master' into honeycomb-release
Allow top-to-bottom card order when rowCount>1

Add a member function to CarouselRS.java called setFirstCardTop()
to allow the first card to appear on top instead of the bottom
when rowCount>1. The default is false, meaning the existing
behaviour is not changed for other apps.

Change-Id: I38d666958ebb802e211496895cbe3f91e78f5392
Allow specifying configurations for mesh primitives

This lets you specify separate alpha, depth read, and depth
write behaviors for each primitive in your mesh. It will be
used by Books to allow drawing shadows separately from the
main model.

Change-Id: I9351f720e6e09260b5bcd335e305922ff48cb373
Update for Allocation API changes.

Change-Id: If3b9d05825adf1bdb495f36e7d020af1bbdb5c7a
Merge branch 'master' into honeycomb-release