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.
Merge commit 'f03733e7a1465b186acc1da11dca18f054c12734' into eclair-plus-aosp
* commit 'f03733e7a1465b186acc1da11dca18f054c12734':
Add dither XML flag to StateListDrawable.
Merge commit '55c6f8881fdd2c5894e6297f49a9c4e0dc81ff8d' into eclair-plus-aosp
* commit '55c6f8881fdd2c5894e6297f49a9c4e0dc81ff8d':
Fix missing break statement found by Motorola.
We currently allow the dither="true" flag to be set on
individual <bitmap> and <nine-patch> objects, but that flag
is overridden when they are included in a <selector>. This
change adds the dither="true" flag to StateListDrawable so
they can be dithered when desired.
Fixes http://b/issue?id=2068024
Merge commit 'a5fa36481cdbe2cd324055d9f508e492482cb7dc' into eclair-plus-aosp
* commit 'a5fa36481cdbe2cd324055d9f508e492482cb7dc':
Remove the decleration of com.android.im.plugin.jar in platform.xml
* changes:
Remove the decleration of com.android.im.plugin.jar in platform.xml Add a column definition for keep_signed_in when query the active account with a given provider
Merge commit '688b0f1235aba0e82ff4eec4d935b494d9c4754d' into eclair-plus-aosp
* commit '688b0f1235aba0e82ff4eec4d935b494d9c4754d':
Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
Merge commit '1cef22890d10417977397a5dccf34956858d0803' into eclair-plus-aosp
* commit '1cef22890d10417977397a5dccf34956858d0803':
Disable data call in emergency call
Merge commit '6f89172b6e149c623fe582e4baa658299a3fc72c' into eclair-plus-aosp
* commit '6f89172b6e149c623fe582e4baa658299a3fc72c':
Fix FallRS by keeping a reference to the mesh.
Merge commit '36d5aaec2ee1f11ea80639c8194e4aac2be3892d' into eclair
* commit '36d5aaec2ee1f11ea80639c8194e4aac2be3892d':
Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
this change fixes the lifetime mgt of EGLSurface, EGLContext and EGLImageKHR in the EGL wrapper.
EGLDisplay is still somewhat bogus and libagl's EGL is still incorrect.
The idea of the change is that EGL objects are put in a list when created and removed when destroyed.
Before each use, we first verify if the object is in the list and if so a reference is taken and kept
for the scope of the whole EGL API being called, if not, an error is returned.
Upon object destruction, the object is simply marked as "terminated" (this is not protected by a lock
because it doesn't really matter). This flag is only used to deny access to the object by other APIs
while it's still valid (for instance current or being used by another function in another thread).
A reference is also removed and the object can then actually be destroyed when going out of scope.
Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
