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
Merge commit 'eba188e21c752d98f03215eb15822bd39c462664'
* commit 'eba188e21c752d98f03215eb15822bd39c462664':
Various tweaks to try to improve low memory behavior.
Merge commit 'db978b1f8ddf2afb14a4ed795895c8849fecd13f'
* commit 'db978b1f8ddf2afb14a4ed795895c8849fecd13f':
Change fade to use a gradient from opaque color to transparent color.
Merge commit '07a0ba4dc9f395fd98cc64660c44fcc0eb3286ab'
* commit '07a0ba4dc9f395fd98cc64660c44fcc0eb3286ab':
Sets default value of 'enableGeolocation' to true. This allows WebKit's DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser's default anyway.
Merge commit '6a538f3fca8ec43e641936c480d1ab48b3a9c09b'
* commit '6a538f3fca8ec43e641936c480d1ab48b3a9c09b':
Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.
Merge commit '561aaedc0220db09d660c29d8237eb937373a7c1'
* commit '561aaedc0220db09d660c29d8237eb937373a7c1':
make sure that the sync thread is protected by a consistent lock
