Merge commit '91800118a129bd63fc19e90da6b52c67036fa424'
* commit '91800118a129bd63fc19e90da6b52c67036fa424':
- don't schedule syncs that we will never dispatch
Merge commit 'e266995bb15914b2e648901b379460953a1ff73b'
* commit 'e266995bb15914b2e648901b379460953a1ff73b':
Adding a column to Contacts, which will be used as an additional "soft" identity.
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.
Merge commit 'a3811e1b16ca0014ef0df7567fdfb8dc9f62dd2c'
* commit 'a3811e1b16ca0014ef0df7567fdfb8dc9f62dd2c':
don't layout when setting size from zoom if only height changed
(companion change in external/webkit)
Add a boolean parameter to WebViewCore.java nativeSizeSize().
If set, only layout if the width has also changed.
If clear, layout if the height alone has changed.
Layout is clear when called from zoom setup, and set otherwise.
Merge commit 'a297a266bdea9f64c6a548661aa4be540c69c676'
* commit 'a297a266bdea9f64c6a548661aa4be540c69c676':
Only add model in the UA for the release build
Merge commit '8c0fa1a2e5966b685f75e438eb089701b404b6ef'
* commit '8c0fa1a2e5966b685f75e438eb089701b404b6ef':
Revert "Remove third party support for Quick Search Box (aka global search)."
This introduces a new mechanism to define features associated with
a platform, query the current device for the available features,
and enforce that apps requiring features that aren't available can't
be installed.
Also now allows uses-library to specify that a library is optional,
so the lack of such a library will not prevent the app from being
installed (but if it does exist it will be correctly linked into
the app).
Change-Id: I5b369b46cfa0b3d37c9e08fd14ef1098a978e67b
Merge commit '7ff4ef6a4654f077d0cc2a77c8907024ad136909'
* commit '7ff4ef6a4654f077d0cc2a77c8907024ad136909':
add an accessor for Context for use by subclasses
Merge commit 'fb8910f958e93b7ad0fcea89fdd1dd579a962b37'
* commit 'fb8910f958e93b7ad0fcea89fdd1dd579a962b37':
Don't activate keyguard if screen is turned off while proximity sensor is active.
Merge commit '3d937945a60da48a383a5a3de37583b35abf9c11'
* commit '3d937945a60da48a383a5a3de37583b35abf9c11':
Change these string constants back to match donut.
Unfortunately we are stuck with the donut ones, can't change these in Eclair
to be the more correct names.
Change-Id: Id8aaa2e90cd21631b18a36bea3755a63d0e6d577
