Merge commit '85655ebcd9dc521e3c11209d24afee432d18b596'
* commit '85655ebcd9dc521e3c11209d24afee432d18b596':
Prevent ListView from scrolling/flinging its content when the content fits on screen.
Previously we had been setting the imageSize parameter to 0, which was
incorrect. According to the OpenGL ES spec for glCompressedTexImage2D
this parameter should be the size in bytes of the compressed data.
Merge commit 'a27b7822200ab8f7a1978ca27ae3e14929b9d665'
* commit 'a27b7822200ab8f7a1978ca27ae3e14929b9d665':
Revert "- don't schedule syncs that we will never dispatch"
Merge commit '2ebf7793e42df72d4198461487f3bd73f17b32a4'
* commit '2ebf7793e42df72d4198461487f3bd73f17b32a4':
Fix property being cleared when DeviceFound signal is received.
Merge commit '91800118a129bd63fc19e90da6b52c67036fa424'
* commit '91800118a129bd63fc19e90da6b52c67036fa424':
- don't schedule syncs that we will never dispatch
Merge commit 'f7d1c27327b6832ce97f233f27b2927a05f8b387'
* commit 'f7d1c27327b6832ce97f233f27b2927a05f8b387':
Set RFCOMM SO_SNDBUF size to 70 KB for large RFCOMM writes.
Merge commit 'e266995bb15914b2e648901b379460953a1ff73b'
* commit 'e266995bb15914b2e648901b379460953a1ff73b':
Adding a column to Contacts, which will be used as an additional "soft" identity.
With a 64 KB OBEX MTU, net/rfcomm/sock.c:rfcomm_sock_sendmsg() quietly drops data.
The default SO_SNDBUF is 24 KB. Empircally, 36 KB still drops, and 38 KB no longer drops (this is because SO_SNDBUF is doubled in net/core/sock.c and then there is OBEX/RFCOMM overhead). Set to 70 KB so we have plenty of room to spare.
See http://b/2090000 to investigate this in more detail later.
The main consumer of this feature is shortcuts.
The LOOKUP KEY column will contain an encoded concatenation of the contact's row id
as well as sync_ids of all constituent raw contacts. It goes with the "contacts/lookup/*/#" URI.
When we get such a URI, we will first try to load the
contact with the specified _id and lookup_key. If we cannot find the contact
that way, we will go scout for the contact that contains most of the sync_ids
we found in the lookup key.
We will need to make sure that the contact picker returns the lookup-style URIs.
Merge commit '46588ef200aec0f6dbc7c07b132d002039fbd45e'
* commit '46588ef200aec0f6dbc7c07b132d002039fbd45e':
disable canceling until the http connection code is understood
Merge commit '71562cc72d1d6be97297bb03b67c217a529ebec7'
* commit '71562cc72d1d6be97297bb03b67c217a529ebec7':
More work on wallpapers: animations, lifecycle, scaling, etc.
Yet more work on improving the behavior of wallpapers. This fixes a few
problems in their lifecycle (corresponding change in the picker also
required for this), makes their animations better for hardware that supports
alpha fades, adds animations for the wallpapers themselves, eliminates
fixed size wallpapers, and adjusts the API for retrieving a wallpaper
bitmap to take care of scaling the raw wallpaper image to match the current
desired width and height.
Change-Id: If1c0aaceba4ea4e175dcb7a8416ca7ddbb9bfa6f
Merge commit '9b52ad61642c84f74c89627eeb28d03ebb44386c'
* commit '9b52ad61642c84f74c89627eeb28d03ebb44386c':
add the ability to specify yieldpoints in a ContentProviderOperation
Merge commit '932cb5507ec2e4249bafb9fa792e37dfa7629412'
* commit '932cb5507ec2e4249bafb9fa792e37dfa7629412':
Fixing bug 2086021. AccessiblityService could sometimes get a null pointer
* changes:
Fixing bug 2086021. AccessiblityService could sometimes get a null pointer exception if multiple accessibility services are running and there are several events all happening within a short period of time.
