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 '6bf39fdbec979908e8a23bf69aa624812d0b377e'
* commit '6bf39fdbec979908e8a23bf69aa624812d0b377e':
Added a workaround to clear the browser cache.
Merge commit 'c2f97178acaf9c406067b9b89776b87ddf9c8558' into eclair-plus-aosp
* commit 'c2f97178acaf9c406067b9b89776b87ddf9c8558':
Added a workaround to clear the browser cache.
Merge commit 'af2b7378af38dcc6d40a93f708b7a1c0ff0ef6bc'
* commit 'af2b7378af38dcc6d40a93f708b7a1c0ff0ef6bc':
When manually setting the uri pass it through to the badge widget.
Merge commit 'fe6104fbfbba0434e78f9e21f460c71cddfe8449' into eclair-plus-aosp
* commit 'fe6104fbfbba0434e78f9e21f460c71cddfe8449':
When manually setting the uri pass it through to the badge widget.
Merge commit '9aa0005e24e4da8004317cd1f632afb567c50ca1'
* commit '9aa0005e24e4da8004317cd1f632afb567c50ca1':
Update getDisplayLabel() API to support new types.
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 'd4644471db5b8b47fa03d099e3efbf69e170d292'
* commit 'd4644471db5b8b47fa03d099e3efbf69e170d292':
Reset backup tracking in response to transport data-wipe notification
Merge commit 'a25ab813c4ebcac876209e026ec7aef4588d77a3'
* commit 'a25ab813c4ebcac876209e026ec7aef4588d77a3':
Make scrolling textfields work better in the browser.
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 '2aefa41a64281f04e469a2ac53b43d04d5c8932d'
* commit '2aefa41a64281f04e469a2ac53b43d04d5c8932d':
Always interpret (0,0) scrolls as top of title bar.
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
Merge commit '4d9a5cc45c723d507f360d8e2339dbcb17ea2253'
* commit '4d9a5cc45c723d507f360d8e2339dbcb17ea2253':
Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer.
Merge commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a' into eclair-plus-aosp
* commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a':
Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer.
