Commit Graph

2133 Commits

Author SHA1 Message Date
Narayan Kamath
31825c1199 am be1b5ce4: am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
* commit 'be1b5ce498a68e28d47a167495f47787d6461e88':
  Fix TTS instantiation from webview accessibility handlers.
2011-11-28 10:42:00 -08:00
Derek Sollenberger
376690c00f am aceb7f8b: am 425c595a: Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
* commit 'aceb7f8b29bdcf8bf7fdc14ec9b99f54f2a2a3d2':
  Update Webkit with the zoom level after double tap gesture
2011-11-28 10:38:41 -08:00
Narayan Kamath
a6f8ebc616 Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1 2011-11-28 10:36:32 -08:00
Ben Murdoch
e189f0c6db am b11387a6: am 2ffc9ec3: Ensure we dismiss the <select> option dialog.
* commit 'b11387a6e51c424e421b0951de20db46a5f5c992':
  Ensure we dismiss the <select> option dialog.
2011-11-28 10:36:22 -08:00
Derek Sollenberger
425c595acb Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1 2011-11-28 10:34:04 -08:00
Narayan Kamath
68e2af55d6 Fix TTS instantiation from webview accessibility handlers.
The TTS instantiated from here shouldn't clobber any
existing TTS objects opened within the same package context.

Ideally, the TTS API should work fine with multiple TTS object
instances within the same package context but making that happen
correctly is a larger change.

bug:5659758
Change-Id: Ia1f63c61b9f12ac92ff42a427a004d414e42a759
2011-11-28 17:49:01 +00:00
Derek Sollenberger
8fae09d575 Update Webkit with the zoom level after double tap gesture
In the hardware accelerated case we were not updating webkit
with the new zoom information. This was causing plugins to
render at the old zoom level.

bug: 5663981
Change-Id: I3cb18ad9ca4f185f384ea9fb68780f29160391ad
2011-11-28 11:51:26 -05:00
Ben Murdoch
2ffc9ec3d6 Ensure we dismiss the <select> option dialog.
When the WebView is paused, or another action (such as navigating to
a new URL) occurs, cancel any ongoing <select> tag dialog that is open.

Bug: 5666545
Change-Id: Ifc35a239b729ed93cbf82b2096334f7d63f8993d
2011-11-28 16:47:55 +00:00
Teng-Hui Zhu
90998b4962 am b8ee50ee: am 7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1
* commit 'b8ee50eece1481110721cb4e93a54c03fbf77d27':
  HTML5 Video runs into super full screen mode
2011-11-22 08:59:36 -08:00
Teng-Hui Zhu
7257a32b9a Merge "HTML5 Video runs into super full screen mode" into ics-mr1 2011-11-22 08:54:59 -08:00
Mangesh Ghiware
07679d191e am d7b06977: am 8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
* commit 'd7b06977e927557923a6101493c0af1aa857271b':
  Update zoom (aka display) density from WebView thread.
2011-11-21 23:18:04 -08:00
Mangesh Ghiware
8d03007f80 Merge "Update zoom (aka display) density from WebView thread." into ics-mr1 2011-11-21 23:14:05 -08:00
John Reck
7b0fdc100e am 786513ab: am 0507ac4d: Use isHighEndGfx to determine texture pool
* commit '786513aba608d958e69deee3fbdf003bdf5d9632':
  Use isHighEndGfx to determine texture pool
2011-11-21 21:07:33 -08:00
Mangesh Ghiware
31f263db65 Update zoom (aka display) density from WebView thread.
Fixes bug 5639675.

Change-Id: I982ca0787f5c050c5d1a288cd8751299ee351214
2011-11-21 17:19:31 -08:00
Teng-Hui Zhu
f45aa7da2b HTML5 Video runs into super full screen mode
bug:5569146

Browser change
https://android-git.corp.google.com/g/#/c/151035/

Change-Id: Ib8449a670caf4aa2b540a170ed5e9f6adea2b12e
2011-11-21 16:56:08 -08:00
John Reck
0507ac4d94 Use isHighEndGfx to determine texture pool
Bug: 5639612

Change-Id: I0ccbf74c2638b61b7eb0769c851e74700f0aa191
2011-11-21 13:30:32 -08:00
Kristian Monsen
38bc731875 am 376e93fc: am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1
* commit '376e93fcea19cd491af59631f3934ab036e1e846':
  Improving PictureListener deprecating comments
2011-11-20 07:31:41 -08:00
Kristian Monsen
7859c1842c Merge "Improving PictureListener deprecating comments" into ics-mr1 2011-11-20 07:26:59 -08:00
Bart Sears
3f6114164f am cb513ba7: am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1
* commit 'cb513ba7f14fdf08b5729edef5baf22e302e3e08':
  Content and viewport rects set in one step.
2011-11-18 15:22:57 -08:00
Bart Sears
e6a96560ed Merge "Content and viewport rects set in one step." into ics-mr1 2011-11-18 11:46:26 -08:00
Kristian Monsen
4aad1022eb Improving PictureListener deprecating comments
Change-Id: If189823962c49db9681845996e97eec31fedcca6
2011-11-18 17:09:12 +00:00
Michael Kolb
778f146cf4 am 5397bb52: am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1
* commit '5397bb52fba04e8dc8496d731611210213847308':
  Draw input field focus ring in WebTextView
2011-11-17 15:12:49 -08:00
John Reck
a93a7d6d15 am 0551287f: am 775e986e: Merge "Fix add single character check" into ics-mr1
* commit '0551287f6ed06511feae2a6b3700a9bca4cfc3cd':
  Fix add single character check
2011-11-17 13:20:15 -08:00
John Reck
6810017f6a am 2c6afef8: am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1
* commit '2c6afef8766371bf933f8675c80687802ce045e0':
  Undeprecate LayoutAlgorithm
2011-11-17 13:20:12 -08:00
Michael Kolb
852585c034 Merge "Draw input field focus ring in WebTextView" into ics-mr1 2011-11-17 12:22:58 -08:00
Ben Murdoch
131ed03f30 am e6269f79: am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1
* commit 'e6269f7988a2ec0d1f9ea37d92d6b0ca2f3dc3b8':
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
2011-11-17 11:46:30 -08:00
Nicolas Roard
0ecd89bce3 am e788fa84: am e88ca718: Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1
* commit 'e788fa84f1fac845e50922fc536694ce1cc2fbdb':
  Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.
2011-11-17 11:46:09 -08:00
Michael Kolb
edb39ce5b4 Draw input field focus ring in WebTextView
Bug: 5628053

Change-Id: I1a3d5402e7925e71877be2c278e95f25e75746f3
2011-11-17 11:08:59 -08:00
John Reck
775e986ece Merge "Fix add single character check" into ics-mr1 2011-11-17 08:48:04 -08:00
John Reck
1da3d65635 Merge "Undeprecate LayoutAlgorithm" into ics-mr1 2011-11-17 08:47:29 -08:00
George Mount
82ed95f410 Content and viewport rects set in one step.
Bug 5342918
 The content rect of the WebView was being retrieved during
 the draw while the viewport rect was being set when the
 draw functor was setup. During animations, the content
 rect was changing between the time the draw functor was
 retrieved and it was executed. The content rect is now
 being set with the viewport rect.

 Wekbkit Change: I05d68dcc

Change-Id: I1b0978eeb27d9f1deddfeba3ede869f735f74394
2011-11-17 08:31:55 -08:00
Mangesh Ghiware
163994c1d4 am 55116350: am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1
* commit '5511635090072ce02a4fb07ec25a7c279a7bbc8a':
  Revert change to setInitialScale() to take display density into account.
2011-11-17 07:48:24 -08:00
Ben Murdoch
fead0e14b4 Merge changes I59323dc5,I31a01aa3 into ics-mr1
* changes:
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
2011-11-17 02:13:19 -08:00
Nicolas Roard
e88ca718ed Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1 2011-11-16 19:40:04 -08:00
Nicolas Roard
2bc0b01ffe Hack to workaround the fact that the EGL context can be
removed from under us by framework in low memory condition.

bug:5627977
Change-Id: I3c138985e3e6c16f7c15497a1a11ffed93cd8e78
2011-11-16 19:31:00 -08:00
Mangesh Ghiware
4fdfdeedc6 Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 2011-11-16 18:01:35 -08:00
John Reck
f9a6c91f75 Fix add single character check
Bug: 5618801

Change-Id: I42a19855b188c9175b8f7a293faa96027685052c
2011-11-16 16:58:56 -08:00
Mangesh Ghiware
e832b63c97 Revert change to setInitialScale() to take display density into account.
Updated WebView documentation to clarify this behavior.

Additionally, if target-densityDpi is specified in the meta viewport
tag, update the display density in ZoomManager.

Bug: 5477652
Bug: 5327492
Change-Id: I176e87489f76a2ee6595d76a006e302b07595de1
2011-11-16 13:31:56 -08:00
Kristian Monsen
9a77be5dac Fix fix for bug 2816327
Remove native methods define for ANDROID_INSTRUMENT calls.

Need to that after the native registering is done in CL:
https://android-git.corp.google.com/g/#/c/148917/

Change-Id: Ic91aec54cb052c29aa06aee028cf8023cd69ed15
2011-11-16 19:59:27 +00:00
Ben Murdoch
cd0dd93d13 WebViewDatabase v11 for ICS.
Bump WebView database version to 11. This has the following effects:

- Removes the old webview cookie table on GB devices. Cookies are now
  managed by the Chromium stack.
- Removes the old webview cache database on GB devices. Cache is now
  managed by the Chromium stack.
- Autocomplete form data is now stored/retrieved based on
  the URL minus the query string/fragment. Upgrade any existing
  form URLs in the database to match this format, so we can
  still use them. This will impact GB and HC devices.

  This has an unfortunate side effect that we may end up with
  duplicate URLs in the formurl table (say we had two URLS for the
  same host but with different query strings). Currently we only take
  the first url from the table - which is fine when they were
  unique. The simplest way to work around this is just iterate all the
  rows returned and use all the values we find.

Bug: 5560410
Change-Id: I59323dc5e523969e0a1c268b5936d6fa998d625c
2011-11-16 19:33:21 +00:00
John Reck
5a1ef4132f Undeprecate LayoutAlgorithm
Bug: 5533078
 There is no alternative and this is still useful and used. It should
 not have been deprecated.

Change-Id: I641026cf76ea87738909827b7c48a556d9021d11
2011-11-16 11:08:44 -08:00
Ben Murdoch
f10daf6470 Fix a bug in the database upgrade process, and refactor slightly.
During upgrade from v9 -> v10 the database version was not
being updated.

Also remove conditionals based on what are effectively hardcoded
truth values to simplfiy the logic greatly.

Bug: 5560410
Change-Id: I31a01aa35a109a951d4e4c6d5b884bb666668b28
2011-11-16 18:47:59 +00:00
John Reck
a952f8abfd am 6a622c56: am a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1
* commit '6a622c5608e3f67efb7ba6a346ea4d8cfa5267ec':
  Call onScrollChanged when scrolling layers
2011-11-15 13:07:11 -08:00
John Reck
83b9e1d99d Call onScrollChanged when scrolling layers
Bug: 5533389
 Treat layer scrolling as a no-op scroll by calling
 onScrollChanged with old scroll == new scroll

Change-Id: I1dc2b94b37c65bf088806b8d28be32883e3b8bee
2011-11-14 16:17:54 -08:00
Kristian Monsen
e1d2f3cf85 Fix build
Change-Id: I8198f7a8470e7c9500ab2f6512162bbb55ea6ee7
2011-11-14 15:28:14 +00:00
Kristian Monsen
10a09dc163 Merge "Removing the ability to get native instrumentation as part of nav dump" 2011-11-14 04:28:32 -08:00
Kristian Monsen
a3c157eef0 Removing the ability to get native instrumentation as part of nav dump
This is to be able to remove ANDROID_INSTRUMENTATION code.

Note that it would only print useful information if webcore
was compiled with ANDROID_INSTRUMENTATION on.

There is an open bug for problems with ANDROID_INSTRUMENTATION:
http://b/issue?id=2816327

Needs Browser CL:
https://android-git.corp.google.com/g/#/c/149442

Change-Id: Ie8c3c3a08a8bb15936831e25faac3155906bae70
2011-11-11 16:11:36 +00:00
Akwasi Boateng
1333742bed am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp
* commit 'cb0db0306b5849a35d3d99eea1b34ce019c6f0d8':
  Make the overridden ImageView#setVisibility remotable
  Clamp non-monotonic stats instead of dropping.
  DO NOT MERGE. Fix leak in LayoutTransition
  Fix lastVisible/global rects
  Fix Wimax-less build.
  Fix leak in LayoutTransition
  Deferring wallpaper update to improve workspace scrolling (issue 5506959)
  Terminate EGL when an app goes in the background
  boot animation is dithered and scaled
  Fix NdefRecord byte-stream constructor.
  PopupWindow dismiss() can get into a recursive loop.
  Fold WiMAX state into the mobile RSSI.
  Remove dedicated wimax icon to fix RSSI layout.
2011-11-11 15:34:19 +00:00
John Reck
9f9fac0ad2 Fix lastVisible/global rects
Bug: 5601629
 References tend to always be equal to the things they are referencing,
 use copies instead.

Change-Id: I0827878e91ef1fa6e0abe2d6499d55f4a211d890
2011-11-10 17:33:24 -08:00
John Reck
2c7db013bc am 0f077739: am 843e04d9: Merge "Pause drawing when not visible" into ics-mr1
* commit '0f0777399defe6bca965d9c33e9dfe256eb56fee':
  Pause drawing when not visible
2011-11-10 19:39:46 +00:00