Merge commit '0d71db4979426c20972e5c1c4488fbf27c3b2863'
* commit '0d71db4979426c20972e5c1c4488fbf27c3b2863':
Fix issue 2077333: The volume key will effect both ring and media vol at the same time.
Merge commit '1b0f6e82f6b4e34109117b77db156cd53da1be94'
* commit '1b0f6e82f6b4e34109117b77db156cd53da1be94':
if exception getMessage() is null, don't add it to the error
Merge commit '75e05a5dbbbb75bb8e1b8f0fb3ff52c7baa8968d'
* commit '75e05a5dbbbb75bb8e1b8f0fb3ff52c7baa8968d':
When we get 304 and switch to cacheLoader, need to set mFromCache to be true.
* changes:
When we get 304 and switch to cacheLoader, need to set mFromCache to be true. So that the cache loading will not create a new mCacheResult which overwrites the old cache data.
Merge commit '153b0226e1f2e60941c420ea1bc8f65cf51c2f50'
* commit '153b0226e1f2e60941c420ea1bc8f65cf51c2f50':
Fix a docs comment to match the parameter name.
Use the fact that the scroller keeps track of the current velocity
to accelerate subsequent flings. The current velocity is added to
the new velocity if the flings are in the same general direction
and if the fling animation hasn't been aborted.
This makes it easier to move to the top or bottom of very large
pages (either in overview mode or reading mode) by taking
consecutive flings as a cue from the user that they want to
page faster. The user can stop the fling with any action as
before.
fixes http://b/issue?id=2066090
This change adds the EventHandler error codes to WebViewClient for the public
api. Previously, the api was ambiguous about the value of the errorCode
parameter and falsely documented that the values are HTTP status codes.
Merge commit '765f49e22d7dbf608710baa95e9769b9133d9483'
* commit '765f49e22d7dbf608710baa95e9769b9133d9483':
re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
Merge commit '85655ebcd9dc521e3c11209d24afee432d18b596'
* commit '85655ebcd9dc521e3c11209d24afee432d18b596':
Prevent ListView from scrolling/flinging its content when the content fits on screen.
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 '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
