Merge commit '3f0476a4e283ce4e55caac016293dafe9dca11fa' into eclair-plus-aosp
* commit '3f0476a4e283ce4e55caac016293dafe9dca11fa':
Basic API for third-party apps to define custom Data rows.
To display styled ContactsContract.Data rows in UI, this
change adds basic styling attributes that third-party apps
can use. The Contacts app parses these structures before
displaying Data rows with unrecognized MIME-types.
Partially fixes http://b/2126691
Merge commit '9bbd5ee49f4a26b87273c40a955557e63f10da3b' into eclair-plus-aosp
* commit '9bbd5ee49f4a26b87273c40a955557e63f10da3b':
Make IBackupTransport.finishBackup() also return an int code, since it too can
* changes:
Make IBackupTransport.finishBackup() also return an int code, since it too can return TRANSPORT_NOT_INITIALIZED (in fact that's typically how it comes).
Merge commit '7f3fb7dec2afdffa37e3067ca8a5b9d01809a9ce' into eclair-plus-aosp
* commit '7f3fb7dec2afdffa37e3067ca8a5b9d01809a9ce':
Turn animations on by default.
Add API to skip the animation for a particular start activity, so that
a latter better one can be used.
Fix Theme.NoDisplay to actually work.
Fiddle with various animations: don't do a different animation for task
switching, try a scale animation for switching in/out of the wallpaper.
Adjust the animation duration so that at normal speed we have something
more like the slower animation option (so slow is now the default).
Change-Id: Ieba9f3db0bd9a762a19b327a3ecccbc7b547893d
Merge commit '9197081f8feca110455740874e06e05771f462c8' into eclair-plus-aosp
* commit '9197081f8feca110455740874e06e05771f462c8':
Send the address of the device with the UUID intent.
return TRANSPORT_NOT_INITIALIZED (in fact that's typically how it comes).
For consistency, make other IBackupTransport methods return int instead of
boolean, and handle accordingly.
Make initializeDevice() its own method instead of a flag on performBackup().
This will be needed when un-checking the settings box anyway, and is
conceptually unrelated to whatever happens to be the first post-initialization
backup we perform. (Note that even if the init is sent separately from the
backup operation, the server will remember that an init has been done and
will *not* return NOT_INITIALIZED for the subsequent backup.)
Fix LocalTransport accordingly (trivial changes).
Handle failures more robustly in BackupManagerService -- most notably,
doQueuedBackups() was ignoring the result code of processOneBackup(), so
a NOT_INITIALIZED error would go past unseen (at least until the next
backup pass). Keep track of error code returns more universally now.
(This includes finishBackup(), of course.)
Merge commit 'a7719af31290bea50d822b535b6a886ba7a88097' into eclair-plus-aosp
* commit 'a7719af31290bea50d822b535b6a886ba7a88097':
Cache the remote device's service channel.
Bluez Device implementation is such that when a device
is unpaired, we removes the device and hence there is no
way to interact with it unless you pair again. Remote service
channel call is used to get the rfcomm channel number which
will be used in profiles like OPP which don't require pairing.
Change-Id: I868a6cdfdb1b7d3591dd8b66cd0320f41a9c1b92
Merge commit '36322db5752c7ec196f59ba94abe5d5a63cc19f5' into eclair-plus-aosp
* commit '36322db5752c7ec196f59ba94abe5d5a63cc19f5':
Add focus API and FLASH_MODE_VIDEO_LIGHT.
Merge commit 'fe6104fbfbba0434e78f9e21f460c71cddfe8449' into eclair-plus-aosp
* commit 'fe6104fbfbba0434e78f9e21f460c71cddfe8449':
When manually setting the uri pass it through to the badge widget.
Merge commit '88a83d3f108dcf01443b241439e14eedbd9615f5' into eclair-plus-aosp
* commit '88a83d3f108dcf01443b241439e14eedbd9615f5':
Update getDisplayLabel() API to support new types.
We recently added several new phone types, and this change
updates the API that resolves thoses types to strings. It
also uses unique string resources for each type, instead of
relying on types to be <string-array> indexes.
Fixes http://b/2118886
Merge commit '9568fb21766684083ec256303a6ed7949ada7d9f' into eclair-plus-aosp
* commit '9568fb21766684083ec256303a6ed7949ada7d9f':
Reset backup tracking in response to transport data-wipe notification
Merge commit 'd3997e556eb0509248c72b668c2cd955b7842b55' into eclair-plus-aosp
* commit 'd3997e556eb0509248c72b668c2cd955b7842b55':
Make scrolling textfields work better in the browser.
The touch slop seems to be too large for scrolling
a small textfield, so use a smaller number. Also,
in WebView, create viewToContentDimension, and use
it for determining the scroll position of the text
field.
Partial fix for http://b/issue?id=2133049
Change-Id: I0ded3be264b179bad39301e6adce86851b649a42
Merge commit '83f7bd0a9bb563e18fc16fe60b923d65accd9dfe' into eclair-plus-aosp
* commit '83f7bd0a9bb563e18fc16fe60b923d65accd9dfe':
Always interpret (0,0) scrolls as top of title bar.
Merge commit '3242cbbf82b515397151522d0a6228403e9eec23' into eclair-plus-aosp
* commit '3242cbbf82b515397151522d0a6228403e9eec23':
Make background color pure black.
Move the specialized code in NEW_PICTURE_MSG_ID to
setContentScrollTo so that a scroll to (0,0), whether
a result of a NEW_PICTURE_MSG_ID or from an initial
layout (or otherwise) is treated as scrolling to the
top of the content, including showing the title bar.
Scrolls to (0,1) will trigger code that animates the
title bar off screen.
Change-Id: Ia6db6d4620dea2bfe62407c4394a8ead38501b2f
When attempting a backup, the transport may inform us that the backend is in an
uninitialized state. This typically means that the device's data has been wiped
after a period [e.g. 90 days] of inactivity. This means that we need to
re-store all data subject to backup, and all of our incremental state tracking
on the device is now stale.
In response, we wipe all of our recorded backup state and restart the backup
pass on all participants.
Merge commit 'f8d8b46a2c684d51cd661a9d479dd895420a90b2' into eclair-plus-aosp
* commit 'f8d8b46a2c684d51cd661a9d479dd895420a90b2':
Add a tip toast for double tap.
Merge commit 'd5ffa12dea99233e6a75048d82ad4daf0373191f' into eclair-plus-aosp
* commit 'd5ffa12dea99233e6a75048d82ad4daf0373191f':
Uri encode phone number before passing it to query.
Merge commit '483a599c0330da087502b5b75bbe82fe8236cbec' into eclair-plus-aosp
* commit '483a599c0330da087502b5b75bbe82fe8236cbec':
Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
Use the set dialog height when the find dialog is up so that
found items at the bottom of the screen are scrolled into view.
This requires a companion change to set the dialog height in
the browser app.
Fixes http://b/issue?id=2122916
Merge commit 'e256c79731ecd412fbf0d566ea6c844ea8e972a1' into eclair-plus-aosp
* commit 'e256c79731ecd412fbf0d566ea6c844ea8e972a1':
log hash of account name in sync event log
Merge commit 'a953ed4bc08cf5fc98f17a399adbd8afdd8293d5' into eclair-plus-aosp
* commit 'a953ed4bc08cf5fc98f17a399adbd8afdd8293d5':
Use icon URI as icon cache key in search dialog
This is a minor optimization for the sake of the aggregator. The aggregator now relies on the display name
instead of structured components. As a result, we only need one column from the data table
for the structured name. For other data types it's data1. Might as well use the same column
for display name.
Change-Id: Ib22d1f1a7a91f12716d1a460e1578f01926c393a
Merge commit '03c87bf51cdf5a105b53b5d6fbf9cfbc6c93751e' into eclair-plus-aosp
* commit '03c87bf51cdf5a105b53b5d6fbf9cfbc6c93751e':
Allow a webpage that wants to scroll off the title bar to do so.
Slows down the animation so the user can see it slide away. Also
move the animation to before we change to view coordinates so it
will not be dependent on the zoom level/screen resolution.
Change-Id: Icc54b2b26c08cd54d84b4e9892a316a5712534e4
