Merge commit 'fe2bddfae1b8c2375f58216871d923cbfe267dd3' into eclair-plus-aosp
* commit 'fe2bddfae1b8c2375f58216871d923cbfe267dd3':
Don't wake up the screen as soon as the lid opens.
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.
Merge commit '6e81a40d078269258d75bf22dd00a9dc22f4d0b9' into eclair-plus-aosp
* commit '6e81a40d078269258d75bf22dd00a9dc22f4d0b9':
Resolve race conditions with disconnect of CDMA data and airplane mode
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.
Until now we had a race condition where the GL rendering thread could
continue rendering a frame after we have returned from the
SurfaceHolder.Callback.surfaceDestroyed notification.
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.
Specifically, wait for data to be deactivated when setPowerStateToDesired()
is called during data activation.
Bug: 2101430
Change-Id: Ia97dd799f779c3f88f66bc1235e7a65958e1e04f
Merge commit 'dbe8bad1d2d68e2f5947ff0a8347dbb498e17ede' into eclair-plus-aosp
* commit 'dbe8bad1d2d68e2f5947ff0a8347dbb498e17ede':
Work around gcc 4.0.3 bug.
This lets recipents determine whether an intent was launched
by a global search suggestion. This will for example
be used when deciding how to log clicks on web search suggestions.
Needed for http://b/issue?id=2097469
Change-Id: Ifc25ec3477a63be8bad094951bfffa7a5e703e7c
This appears to fix the sim-eng build on the gDapper build machines.
Basic problem is that LayerBuffer::OverlaySource has a constructor that
calls SurfaceFlinger.signalEvent(). SurfaceFlinger lists LayerBuffer
as a friend, but that's not enough to convince gcc that the embedded
OverlaySource class is also a friend. I don't see a way to make them
friendly, so I marked signalEvent() as public.
Merge commit 'c2f97178acaf9c406067b9b89776b87ddf9c8558' into eclair-plus-aosp
* commit 'c2f97178acaf9c406067b9b89776b87ddf9c8558':
Added a workaround to clear the browser cache.
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.
