Commit Graph

13856 Commits

Author SHA1 Message Date
Grace Kloba
c0524d26a6 am 3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2
Merge commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565' into eclair-mr2-plus-aosp

* commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565':
  DO NOT MERGE
2010-03-01 16:13:21 -08:00
Grace Kloba
3ff7cecd3d Merge "DO NOT MERGE" into eclair-mr2 2010-03-01 16:02:12 -08:00
Grace Kloba
3ca122df9e am cfb50c66: Merge "If we get TOUCH_UP before getting the WebCore\'s response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2
Merge commit 'cfb50c66faf4ff8a6f76884fdaf2dcb48d4d63a3' into eclair-mr2-plus-aosp

* commit 'cfb50c66faf4ff8a6f76884fdaf2dcb48d4d63a3':
  If we get TOUCH_UP before getting the WebCore's
2010-03-01 13:11:55 -08:00
Grace Kloba
cfb50c66fa Merge "If we get TOUCH_UP before getting the WebCore's response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2 2010-03-01 13:07:06 -08:00
Grace Kloba
a752a949af If we get TOUCH_UP before getting the WebCore's
response for TOUCH_DOWN, remove the pending TOUCH_EVENT
before proceeding to fling.

This is partial fix for 
http://b/issue?id=2450534
2010-03-01 12:29:11 -08:00
Grace Kloba
ef962fc34c DO NOT MERGE
Manual merge part of https://android-git.corp.google.com/g/#change,42462
from master to mr2 for Adobe.

Fix http://b/issue?id=2475242
2010-03-01 12:13:01 -08:00
Derek Sollenberger
a630dcdb95 am ecde72fe: Ensure the IME is rendered above the surface when we z-order the surface to be on top.
Merge commit 'ecde72fe411811ca02a2565bf73b86e6e8ddc76b' into eclair-mr2-plus-aosp

* commit 'ecde72fe411811ca02a2565bf73b86e6e8ddc76b':
  Ensure the IME is rendered above the surface when we z-order the surface to be on top.
2010-03-01 12:09:10 -08:00
Derek Sollenberger
ecde72fe41 Ensure the IME is rendered above the surface when we z-order the surface to be on top. 2010-03-01 14:11:10 -05:00
Grace Kloba
cbe4f88747 am a406fb90: DO NOT MERGE
Merge commit 'a406fb90805adf36fe0fabd3a79018e33706453c' into eclair-mr2-plus-aosp

* commit 'a406fb90805adf36fe0fabd3a79018e33706453c':
  DO NOT MERGE
2010-02-24 18:39:55 -08:00
Grace Kloba
a406fb9080 DO NOT MERGE
If mPreventDrag is cancelled due to time out, remove
the pending TOUCH_EVENTS and then send an ACTION_CANCEL
and skip the rest of touch events.

This should address the drag problem Flash plugin has.

Fix http://b/issue?id=245053
2010-02-24 18:24:48 -08:00
Grace Kloba
3db1ebaf1c am 4ed2b1c3: Pass touch event time from Java to WebKit
Merge commit '4ed2b1c34b2dd0e2bd2f403a6f3de0bdbf473b98' into eclair-mr2-plus-aosp

* commit '4ed2b1c34b2dd0e2bd2f403a6f3de0bdbf473b98':
  Pass touch event time from Java to WebKit
2010-02-02 21:07:05 -08:00
Grace Kloba
4ed2b1c34b Pass touch event time from Java to WebKit 2010-02-02 19:08:41 -08:00
Patrick Scott
5b7ea0146d am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2
Merge commit 'e7b2845d685a583e8e84de369b6acfa1bebeabf4' into eclair-mr2-plus-aosp

* commit 'e7b2845d685a583e8e84de369b6acfa1bebeabf4':
  DO NOT MERGE
2010-01-26 10:11:30 -08:00
Grace Kloba
c811cd916f am caf0ce3c: Delay resetting mPreventDrag flags so that the Plugin will have more time to respond whether it wants to handle the touch events. (not have to return the value from WebViewCore before the first tap is up)
Merge commit 'caf0ce3ca2b3deba4bcff6c920740bafd87f2b62' into eclair-mr2-plus-aosp

* commit 'caf0ce3ca2b3deba4bcff6c920740bafd87f2b62':
  Delay resetting mPreventDrag flags so that the Plugin
2010-01-26 10:09:52 -08:00
Grace Kloba
cf0957ce4b am 77dc179b: As embedded and full screen shares the same view, we have to replace the AbsoluteLayout with ViewGroup.Layout before setting it to the dialog as dialog\'s FrameLayout doesn\'t accept AbsoluteLayout.
Merge commit '77dc179baa7b8fb405633fd46324e336285d10e2' into eclair-mr2-plus-aosp

* commit '77dc179baa7b8fb405633fd46324e336285d10e2':
  As embedded and full screen shares the same view,
2010-01-26 10:09:39 -08:00
Patrick Scott
e7b2845d68 Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2 2010-01-26 10:07:23 -08:00
Grace Kloba
caf0ce3ca2 Delay resetting mPreventDrag flags so that the Plugin
will have more time to respond whether it wants to
handle the touch events. (not have to return the
value from WebViewCore before the first tap is up)

Fix a potential null pointer exception.
2010-01-25 18:36:48 -08:00
Mathias Agopian
3348f5ae6e DO NOT MERGE
return an error when Surface::lock() is called while the surface is already locked.
2010-01-25 07:51:29 -05:00
Grace Kloba
77dc179baa As embedded and full screen shares the same view,
we have to replace the AbsoluteLayout with
ViewGroup.Layout before setting it to the dialog
as dialog's FrameLayout doesn't accept AbsoluteLayout.

This should fix the crash when changing orientation.
2010-01-21 19:13:34 -08:00
Derek Sollenberger
1f7747adb6 am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode.
Merge commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1' into eclair-mr2-plus-aosp

* commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1':
  Resize the WebView when the soft-keyboard appears in landscape mode.
2010-01-21 08:29:33 -08:00
Derek Sollenberger
7cabb03da7 Resize the WebView when the soft-keyboard appears in landscape mode.
The WebView notifies the IME that it wishes to be resized when the
soft-keyboard is displayed. This fixes http://b/2170192.
2010-01-21 10:37:38 -05:00
Nicolas Roard
0123101af0 am af2af4e5: Add proper support for fixed position elements
Merge commit 'af2af4e53aedb14c781d0351565fd7bec55a141a' into eclair-mr2-plus-aosp

* commit 'af2af4e53aedb14c781d0351565fd7bec55a141a':
  Add proper support for fixed position elements
2010-01-14 13:13:26 -08:00
Nicolas Roard
af2af4e53a Add proper support for fixed position elements
this is two-part change, see  http://android-git.corp.google.com/g/#change,37091 for the C++ counterpart.
This CL implements fixed position elements (css position: fixed) using layers, supporting pixels and percent lengths.

It addresses http://b/1914365
2010-01-14 14:46:07 +00:00
Patrick Scott
70c4f6cfb4 am 021b7b44: Add a static method to obtain the mime type from extension.
Merge commit '021b7b443fa4bb24ec73d0c09cf019c14eba67bc' into eclair-mr2-plus-aosp

* commit '021b7b443fa4bb24ec73d0c09cf019c14eba67bc':
  Add a static method to obtain the mime type from extension.
2010-01-13 11:37:33 -08:00
Patrick Scott
021b7b443f Add a static method to obtain the mime type from extension.
This method is used by WebKit to obtain the mime type from an extension.

Bug: 2368893
2010-01-13 14:12:43 -05:00
Leon Scroggins
ace8addce4 am 2edd6826: Create a new ImeOption that disables fullscreen in landscape, and use it.
Merge commit '2edd68260f26cbd6eddd0df16404bb6bcb22b3b6' into eclair-mr2-plus-aosp

* commit '2edd68260f26cbd6eddd0df16404bb6bcb22b3b6':
  Create a new ImeOption that disables fullscreen in landscape, and use it.
2010-01-13 06:11:05 -08:00
Leon Scroggins
2edd68260f Create a new ImeOption that disables fullscreen in landscape, and use it.
EditorInfo:
Add a flag to tell the InputMethodService to never go into fullscreen
mode.

InputMethodService:
When the new flag is set, onEvaluateFullscreenMode always returns
false.

WebTextView:
Use the new flag, along with IME_FLAG_NO_EXTRACT_UI.  Fixes
http://b/issue?id=2358360
2010-01-12 17:29:25 -05:00
Derek Sollenberger
1fed31aa81 am fef4874a: fixing build break by removing unused imports.
Merge commit 'fef4874afddeeba8eaac6da49cc3203e9ce2d009' into eclair-mr2-plus-aosp

* commit 'fef4874afddeeba8eaac6da49cc3203e9ce2d009':
  fixing build break by removing unused imports.
2010-01-11 13:31:43 -08:00
Derek Sollenberger
fef4874afd fixing build break by removing unused imports. 2010-01-11 16:26:07 -05:00
Derek Sollenberger
d55aa75138 am 7c5bf466: consolidating to only use one surface per plugin. give plugin access to java context.
Merge commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db' into eclair-mr2-plus-aosp

* commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db':
  consolidating to only use one surface per plugin. give plugin access to java context.
2010-01-11 13:11:13 -08:00
Derek Sollenberger
7c5bf4666c consolidating to only use one surface per plugin. give plugin access to java context.
There is a companion commit in external webkit.
2010-01-11 13:47:54 -05:00
Leon Scroggins
ff7d33b55b am 04e0a101: Bring up IME after receiving a response from webkit.
Merge commit '04e0a1018f69b38827e63a7f19a4d1e341f9725a' into eclair-mr2-plus-aosp

* commit '04e0a1018f69b38827e63a7f19a4d1e341f9725a':
  Bring up IME after receiving a response from webkit.
2010-01-11 06:42:13 -08:00
Leon Scroggins
04e0a1018f Bring up IME after receiving a response from webkit.
Fix for http://b/issue?id=2361658

Requires a change to external/webkit
2010-01-11 09:10:20 -05:00
Leon Scroggins
4e9a9d8ea8 am c89b13b9: Use Calendar.add() instead of Calendar.roll()
Merge commit 'c89b13b962c6634db536e563a42d058702ce045b' into eclair-mr2-plus-aosp

* commit 'c89b13b962c6634db536e563a42d058702ce045b':
  Use Calendar.add() instead of Calendar.roll()
2010-01-08 06:43:36 -08:00
Leon Scroggins
c89b13b962 Use Calendar.add() instead of Calendar.roll()
Calendar.roll() breaks the year at the beginning of the year, so
use add() instead, which changes larger fields.

Also, only use 4 bins, since the last bin's boundary is not relevant.

Lastly, no need to return Calendar in beginningOfDay.

Fixes http://b/issue?id=2361382
2010-01-08 09:18:37 -05:00
Cary Clark
2110bb024e am affa5d2c: remove unused jni interfaces
Merge commit 'affa5d2c0f7c2ade43ded5ff9a7952b269183117' into eclair-mr2-plus-aosp

* commit 'affa5d2c0f7c2ade43ded5ff9a7952b269183117':
  remove unused jni interfaces
2010-01-07 10:19:56 -08:00
Cary Clark
affa5d2c0f remove unused jni interfaces
Also make package interfaces unused outside of WebView.java
private.

companion change in external/webkit
2010-01-07 13:02:42 -05:00
Leon Scroggins
bd6029fc51 am 3a503399: Request <label> info only when accessing a textfield.
Merge commit '3a5033996e9df21abbd5b296d817c2acaedcb0f9' into eclair-mr2-plus-aosp

* commit '3a5033996e9df21abbd5b296d817c2acaedcb0f9':
  Request <label> info only when accessing a textfield.
2010-01-07 05:46:19 -08:00
Leon Scroggins
3a5033996e Request <label> info only when accessing a textfield.
Previously, we were storing the label info each time we build the
navigation cache.

Requires a change to external/webkit.
2010-01-07 08:33:34 -05:00
Cary Clark
9e5f3ec97d am e3bbaf6c: Merge "set nine patch padding initially to an empty rectangle" into eclair-mr2
Merge commit 'e3bbaf6c4f51f8201922cae29daa7e46f6c43bda' into eclair-mr2-plus-aosp

* commit 'e3bbaf6c4f51f8201922cae29daa7e46f6c43bda':
  set nine patch padding initially to an empty rectangle
2010-01-06 13:45:59 -08:00
Leon Scroggins
fbd3afb180 am e38fc189: Show label information as hint text
Merge commit 'e38fc1898183a6bf8b0542a1d2627cdbcbd63198' into eclair-mr2-plus-aosp

* commit 'e38fc1898183a6bf8b0542a1d2627cdbcbd63198':
  Show label information as hint text
2010-01-06 13:45:46 -08:00
Cary Clark
e3bbaf6c4f Merge "set nine patch padding initially to an empty rectangle" into eclair-mr2 2010-01-06 09:52:54 -08:00
Cary Clark
e57b7b09b1 set nine patch padding initially to an empty rectangle
Formerly, the padding state was set to null. Copying the padding
state fails when the null rectangle contents are referenced.

fixes http://b/2219785
2010-01-06 10:53:43 -05:00
Leon Scroggins
e38fc18981 Show label information as hint text
Fix for http://b/issue?id=2331526

Requires a change to external/webkit.
2010-01-06 10:15:00 -05:00
Grace Kloba
552346a743 am 106f9b24: Patch from Huahui Wu.
Merge commit '106f9b244633171ab75dd98b9761b7137c1a4705' into eclair-mr2-plus-aosp

* commit '106f9b244633171ab75dd98b9761b7137c1a4705':
  Patch from Huahui Wu.
2010-01-05 11:20:18 -08:00
Grace Kloba
106f9b2446 Patch from Huahui Wu.
Fix http://b/issue?id=1908085
2010-01-05 10:50:39 -08:00
Nicolas Roard
081798f912 am 38863336: layers support
Merge commit '3886333644467beeaf60c13fb94f242538067765' into eclair-mr2-plus-aosp

* commit '3886333644467beeaf60c13fb94f242538067765':
  layers support
2010-01-04 11:42:41 -08:00
Nicolas Roard
3886333644 layers support 2010-01-04 19:30:55 +00:00
Grace Kloba
8d562f78b4 am bc7afcb9: Merge "free the NPObject in NPP_Destroy." into eclair-mr2
Merge commit 'bc7afcb94688dedb0ae9b4b3415f46aa13e713e5' into eclair-mr2-plus-aosp

* commit 'bc7afcb94688dedb0ae9b4b3415f46aa13e713e5':
  free the NPObject in NPP_Destroy.
2010-01-04 10:01:24 -08:00
Grace Kloba
9002eb4404 am 67166b6e: Merge "Cleanup the cache file when we decide not saving it. This logic was lost when we switched back using FLASH instead of RAM for the cache." into eclair-mr2
Merge commit '67166b6eaea7a3bc83ec7bf2876b3807cda859f1' into eclair-mr2-plus-aosp

* commit '67166b6eaea7a3bc83ec7bf2876b3807cda859f1':
  Cleanup the cache file when we decide not saving it.
2010-01-04 10:01:16 -08:00