Merge commit 'cb7d38380cb2ca57e98cd39a96b32a1e804bf00b' into eclair-plus-aosp
* commit 'cb7d38380cb2ca57e98cd39a96b32a1e804bf00b':
Subscribe to subscribedfeeds whenever the accounts change, this is basically a giant hack to let the gsync server know about the subscriptions for accounts.
Merge commit '7bc08e9d51d3142717a94098f897a776f7b7bd71' into eclair-plus-aosp
* commit '7bc08e9d51d3142717a94098f897a776f7b7bd71':
Implement new title bar hiding/showing behavior.
Remove the code that hides the title bar when the page finishes loading.
When the user double taps, if it did not result in changing the viewing
mode (i.e. on a mobile site), send a message to the client so we can
toggle the title bar's visibility. Required for a change to
packages/apps/Browser
Change-Id: I0040fd183ce5673a4069e943f38eb31599c0ca7d
Merge commit 'c0234a9df9cffc0166c39eb0e8561d664a5438a3' into eclair-plus-aosp
* commit 'c0234a9df9cffc0166c39eb0e8561d664a5438a3':
Compose Message "To" field allows adding sequence of characters as contact
Merge commit 'df8a3f31d871db25e952972c2eb346a71186e9e3' into eclair-plus-aosp
* commit 'df8a3f31d871db25e952972c2eb346a71186e9e3':
adding harness for plugin testing to be built upon
Merge commit '840b856d2a7287e98526d3957715eba3677e872f' into eclair-plus-aosp
* commit '840b856d2a7287e98526d3957715eba3677e872f':
don't center zoom on size change if zoom is in progress
The onSizeChange code is called when the device is rotated and
when the title bar is hidden. In the latter case, it is in response
to the zooming transition from overview mode to reading mode, and
the zoom center should not be recomputed.
http://b/issue?id=2060720
Merge commit 'd507ff21296b10ed57feec1200a8fe7eb09c0fc4' into eclair-plus-aosp
* commit 'd507ff21296b10ed57feec1200a8fe7eb09c0fc4':
Check for a null history item to avoid crashing.
Merge commit 'b321625b859f2db4407810929ca6fa6074f65403' into eclair-plus-aosp
* commit 'b321625b859f2db4407810929ca6fa6074f65403':
Remove frameworks/base/im since these stuff are only used by IM app
* changes:
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.
When we select this option, this sequence of characters (which is neither a
valid email address nor a phone number), gets stored in contact with type MOBILE.
Fix: In function canAddToContacts, adding a check to validate whether the contact
to be added is a valid email address or phone number. If not, user will not be shown
with the option "Add to Contacts".
Merge commit '4e9718d6ae3433a3f78fddf158a15701101ba781' into eclair-plus-aosp
* commit '4e9718d6ae3433a3f78fddf158a15701101ba781':
Fix synchronous xml requests with ssl errors.
Use the in-memory ssl preference table before posting a message to the WebCore
thread. Since the WebCore thread is blocked waiting for the ssl resource, we
cannot query the user for their preference. If the table does not contain the
user's decision, bail on the request to avoid a deadlock.
Also mark a few of the ssl handler's method's as synchronized. This was reported
by findbugs.
Merge commit '7fdab7f9674aadf90c3be1f06d7d34b60151c658' into eclair-plus-aosp
* commit '7fdab7f9674aadf90c3be1f06d7d34b60151c658':
The new webkit won't keep RAM cache if http header has "no-store". So remove
* changes:
The new webkit won't keep RAM cache if http header has "no-store". So remove it from StreamLoader. And fix the code where we only want to cache network result.
Merge commit '8a2000df6d32f4e5df3073753055800a9363a3a5' into eclair-plus-aosp
* commit '8a2000df6d32f4e5df3073753055800a9363a3a5':
Adds Java-side of logic to make Geolocation obey Browser 'Enable Location' setting.
Merge commit '25131299aaa1b8c4f44edb33f71f0241a61939e4' into eclair-plus-aosp
* commit '25131299aaa1b8c4f44edb33f71f0241a61939e4':
Adds the ability to set Geolocation permissions from DumpRenderTree on Android.
Merge commit '84235ee923c13e58ce339c25c86f734b338a81e0' into eclair-plus-aosp
* commit '84235ee923c13e58ce339c25c86f734b338a81e0':
Add extra to exclude specific MIME-types from Fast-Track.
Also added ContactHeaderWidget accessor for passing along
this list when triggering Fast-Track. This is used so that
the header widget can hide the profile icon when launched
while already looking at the profile.
