Commit Graph

2033 Commits

Author SHA1 Message Date
Bart Sears
b227cce316 Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0 2011-10-14 16:09:46 -07:00
Ben Murdoch
817d6d5e8e Check MediaPlayer state, do not teardown() from UI thread.
The teardown() function should only be called from the native
thread when WebCore is happy for us to release the media player.

When we lose audio focus, simply stop playback. Also be careful
not to check the playing state of the MediaPlayer if we are in
the error state.

Bug: 5461143

Change-Id: Iba03bdad5c39b104b3071129430d7ef2177e9358
2011-10-14 22:11:26 +01:00
John Reck
d82cc1de84 Merge "Fixup JNI" into ics-mr0 2011-10-14 10:10:07 -07:00
John Reck
b61bfed7b1 Fixup JNI
Bug: 5459736

Change-Id: Iefb5daaf52eb56f2a4c3aaeedc977a16a1cfa086
2011-10-13 19:07:50 -07:00
Steve Block
33f962b22e Improve JavaDoc for WebView.loadData()
Make clear that the charset specified in the mediatype portion of a data URL
overrides that specified in the HTML or XML document itself.

Bug: 5418915
Change-Id: Iff7305b6ac9e656d0fb7ed1b2ffe6fd0e21be49b
2011-10-13 15:32:13 -07:00
Mangesh Ghiware
a6708c6a46 Merge "Add setting for configuring zoom level on double-tap." into ics-mr0 2011-10-13 09:17:10 -07:00
Mangesh Ghiware
edb528ef52 Add setting for configuring zoom level on double-tap.
In overview mode, text wrap is done at reading level scale. If user
changes double-tap zoom in overview mode, reflow text at the new scale.
In any other mode, a double-tap will take user to overview mode, at
which point, the text will be reflowed at the updated reading level
scale.

Bug: 5312461
Change-Id: I29be34a32246019101a9a875e1758e22b5af2bd3
2011-10-12 15:24:29 -07:00
Steve Block
c0c394ee05 Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0 2011-10-12 09:58:25 -07:00
Steve Block
8eb83b96ac Modify BrowserFrame.requestClientCert() to take the host and port as a String
Currently we get the host and port from Chromium as a std::string, convert to a
jbyte array to pass over JNI, then convert to String. It's simpler to convert
directly to jstring and to pass that over JNI.

Requires https://android-git.corp.google.com/g/141234
in external/webkit.

Bug: 5442710

Change-Id: I5480471a841c24481ef09d836a8b0c778251b119
2011-10-12 09:51:22 +01:00
Michael Kolb
64b4f16adf Support spellcheck attribute in WebTextView
Bug: 5267547

    set no suggestions for WebTextView when spellcheck attribute is
    false
    depends on CL: https://android-git.corp.google.com/g/#/c/141326/2

Change-Id: I4ad476270607e9d600567bbb4d9fd321893707b1
2011-10-11 14:19:53 -07:00
Derek Sollenberger
1d805c2b90 Merge "Delay sending Plugin Draw event until the surface is ready." 2011-10-10 13:28:01 -07:00
Derek Sollenberger
281432c467 Delay sending Plugin Draw event until the surface is ready.
bug: 5436630
Change-Id: Ib66859b94b60fc5ea2a8db5e2e40690a084d5b0a
2011-10-10 16:19:56 -04:00
John Reck
cca606d7c3 Improve loadData JavaDoc
Bug: 5425567

Change-Id: I2feff8ac69b2bb790aec8c5f710af0df257e28fb
2011-10-10 12:55:22 -07:00
Steve Block
b19c7878cc Improve documentation for WebView.loadUrl() to specify charset
Bug: 5435233
Change-Id: I69a8e0c551b58f284cfa95dccfc0ea49b0bbf05f
2011-10-10 16:57:05 +01:00
Michael Kolb
b762d1e5ea Merge "Handle audio focus in HTML5 audio" 2011-10-07 15:07:29 -07:00
Michael Kolb
889453b892 Handle audio focus in HTML5 audio
Bug: 5416191

    Video will follow later

Change-Id: I51da05aa0e3c8c0f33151df84d84a65cb7003080
2011-10-07 14:22:29 -07:00
John Reck
25d888b5ff Merge "Fix calc visible to account for action bar" 2011-10-07 13:10:55 -07:00
Steve Block
fe33a75cc8 Add WebViewClient.onProceededAfterSslError()
This is used to notify the host application that an SSL error occurred while
loading a resource, but the WebView but chose to proceed anyway based on a
decision retained from a previous response to onReceivedSslError().

Bug: 5403366
Change-Id: I51a25b93d7824b7eb7b6d5a961cba948e37c85db
2011-10-07 15:14:23 +01:00
John Reck
fffce6fe99 Fix calc visible to account for action bar
Bug: 5425892

Change-Id: I15bc1779013dbb33511d9c5bff9b678115dec102
2011-10-06 20:37:01 -07:00
Nicolas Roard
98a5fcd895 Merge "Trigger a full screen repaint when touching layers, as webkitDraw() may not generate the correct invalidations." 2011-10-06 18:29:20 -07:00
Nicolas Roard
dee7b1ba96 Trigger a full screen repaint when touching layers, as webkitDraw()
may not generate the correct invalidations.

counterpart java CL: https://android-git.corp.google.com/g/#/c/140427/

bug:5425608 bug:5218173
Change-Id: I4a958a6fac4054a1040cb077cdfa2aff076e3fad
2011-10-06 17:12:40 -07:00
Svetoslav Ganov
7853c579fa Merge "Fixing errors in position information of scrollable views reported for accessibility." 2011-10-06 15:13:06 -07:00
Svetoslav Ganov
d9ee72fddb Fixing errors in position information of scrollable views reported for accessibility.
1. ScrollView/HorizontalScroll view were reporting only the scroll X and Y but
   failed to convey the max scroll along X and Y so the position can be determined.

2. WebView was not reporting correctly its scroll position for accessibility.

3. Some descendants of AdapterView were reporting incorrect position information.

4. Updated the accessibility docs with some details about the scroll information.

5. Cleaned up duplicated code.

bug:5412132
bug:5412265

Change-Id: I165e73ecde027dad811425b9f395a3f758c923ba
2011-10-06 14:42:58 -07:00
Steve Block
1672124255 Merge "Improve a warning message in WebViewCore's EventHub" 2011-10-06 10:35:33 -07:00
Ben Murdoch
923154914d Merge "Pass correct units for text size in autocomplete drop down." 2011-10-06 10:23:20 -07:00
John Reck
68b9074a60 Merge "Prevent adapter flickering" 2011-10-06 10:22:03 -07:00
Steve Block
3475ebfab2 Merge "Fix SslError.getPrimaryError() to return -1 if the set of errors is empty" 2011-10-06 08:48:52 -07:00
Steve Block
7b65a3eb29 Improve a warning message in WebViewCore's EventHub
These warnings appear occasionally and this will help track them down.

Also removes an unused method.

Bug: 5421676
Change-Id: I5ba3f146449623e3457aafc91fd2e7edc367a9d9
2011-10-06 14:54:31 +01:00
Ben Murdoch
f88a56e2b1 Pass correct units for text size in autocomplete drop down.
We need to set the size of the text used in the autocomplete
drop down in pixels, as we do when setting the size of the
EditText itself.

Bug: 5420125
Change-Id: Ife6d8c108c57106ffaa8706fa9e4e537a73a1733
2011-10-06 12:10:31 +01:00
John Reck
a607060bbd Prevent adapter flickering
Bug: 5403763
 Prevent rapidly switching between a null adapter and a valid
 adapter by only clearing if the node pointer changes or the text view
 is no longer autocompletable.

Change-Id: Ie594396db807b5ad5e1a5a0e68ec0c7677364aaf
2011-10-05 18:26:57 -07:00
George Mount
67f9d32e5e Merge "Fix monkey NullPointerException" 2011-10-05 15:33:46 -07:00
Steve Block
518f72ca38 Fix SslError.getPrimaryError() to return -1 if the set of errors is empty
Also fix a couple of buggy asserts.

Bug: 5416594
Change-Id: I0e7e2548886af5fc0b8c20f70a3040d2c5bc68ea
2011-10-05 23:09:23 +01:00
Steve Block
cfb753a641 Merge "Fix SslCertLookupTable to correctly determine whether we have a valid cached decision" 2011-10-05 14:56:21 -07:00
Nicolas Roard
f270a1521c Merge "Streamline the layers update codepath. Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work." 2011-10-05 11:35:29 -07:00
Steve Block
f219f23aec Fix SslCertLookupTable to correctly determine whether we have a valid cached decision
We should only re-use a cached 'allow' decision if the decision ...
- is for the same host
- is for an error which is at least as severe as the current error

Bug: 5409251
Change-Id: Id8516f58c8d23de44e80539ffeaf945be3d2914a
2011-10-05 18:01:54 +01:00
Steve Block
bf52c0ea10 SSL-related cleanup in BrowserFrame and SslCertLookupTable
- Fix a comment in BrowserFrame.certificate()
- Simplify SslCertLookupTable by not storing 'deny' decisions.
  We only need to store 'allow' decisions, as we don't re-use 'deny' decisions.

No change in behaviour.

Bug: 5409251
Change-Id: I447cd1966fbb6c2dea8088b2e4c4e2de22405cb9
2011-10-05 13:32:32 +01:00
Steve Block
270a3c8062 Clean up SslErrorHandlerImpl
- Use assert rather than junit.framework.Assert
- Add some comments
- There's no need for checkSslPrefTable() to call handleSslErrorResponse() as
  we'll never update the table. Instead call
  LoadListener.handleSslErrorResponse() directly.

No functional change.

Bug: 5409251
Change-Id: I0c6cdae43fa966f86f4a6c43b74c2f2a01f60319
2011-10-05 13:28:28 +01:00
Steve Block
fa03f9a346 Fix BrowserFrame to construct SslError using the full URL, rather than the host
https://android-git.corp.google.com/g/#/c/133348 changed BrowserFrame to
construct the SslError using only the host. This was done so that we match on
just the host component of the URL when re-using previous decisions in case of
an SSL error. It also means that the browser displays only the host when it
shows the SSL error dialog.

This change fixes BrowserFrame to pass the full URL to SslError. We modify
SslCertLookupTable to keep the existing behaviour regarding matching on only the
host component. There's no need to change Browser to continue displaying only
the host as I think this change was an unintentional side-effect.

Also remove dead code-path in BrowserFrame.reportSslCertError(). This
method is used only with the Chromium HTTP stack. This code was added
in https://android-git.corp.google.com/g/#/c/121023.

No functional change.

Bug: 5410252
Change-Id: Ief2dbf4558095fb6fa7ab0caac7d37fa4f640b66
2011-10-05 13:16:17 +01:00
Nicolas Roard
dc221e01ff Streamline the layers update codepath.
Directly update the layers transform and position.
This makes updates faster and less dependent on other webkit work.

bug:5218173
Change-Id: I5f784ef64eda1be3cee406aa23702e5378c8de9e
2011-10-04 17:57:59 -07:00
John Reck
213478b858 Merge "Hardware accelerated button focus rings" 2011-10-03 15:01:10 -07:00
George Mount
1fa26cbfc8 Fix monkey NullPointerException
bug: 5385775
 Check mWebViewCore has been destroyed
 Remove mWebTextView from WebView when WebView is destroyed
 Clear WebTextView's handler when it is removed from WebView

Change-Id: I9c62292d693109e692c341e3e4dba3e04af81fe4
2011-10-03 14:40:52 -07:00
John Reck
bdfb3c5a69 Hardware accelerated button focus rings
Bug: 5353510

Change-Id: Ie6a2c509b5890d3d091465a36804648999228553
2011-10-03 14:14:33 -07:00
Adam Powell
f8419a0299 Fix bugs around overlay action modes.
Multiple focusable windows cause undesired behavior around selection
modes. TextView isn't sure how to behave when it loses window focus
with regard to selection handles and action modes need to be focusable
for WebView find on page since it uses an EditText as a custom view.

For now:

* Use a layered window decor for overlay action mode when there is no
  action bar requested. This eliminates an extra window and avoids the
  issue described for full-screen UIs.

* Disable WebView's find-on-page mode when the action mode's UI will
  not be focusable. This only affects WebViews in floating windows.

Also remove the "Text Selection" title for WebView's selection mode at
UX's request, as it is inconsistent with TextView's selection mode and
the string does not fit on phones in portrait even on wide
devices. This now uses the same mechanism used in TextView to decide
whether to use title text.

Change-Id: I80caeecea9b47728cf26bb0a388153ca0bdeafe1
2011-10-03 13:20:23 -07:00
Russell Brenner
b76b3b1c81 Center box text vertically
Apply Gravity.CENTER_VERTICAL for single-line editable text

Bug: 5267547
Change-Id: Ie81354214e6eb97554d1f9e8e47377a2b0e73df6
2011-09-30 17:03:32 -07:00
Mangesh Ghiware
293fe94920 Merge "Force a WebView pictureset reset on screen rotation." 2011-09-29 15:57:51 -07:00
Mangesh Ghiware
e8b05e858a Force a WebView pictureset reset on screen rotation.
This fixes some stale content issues when rotating the screen.

Bug: 5357237
Bug: 5361852
Change-Id: I574dac15dbb1a35a8830377848f38ba2b766f095
2011-09-29 13:41:34 -07:00
Steve Block
29af074436 Merge "Fix HTML5Audio to call WebView.isPrivateBrowsingEnabled() on the UI thread" 2011-09-29 04:09:45 -07:00
John Reck
55b039f1b7 Merge "Support for correctly scaling text selection handles" 2011-09-28 11:11:57 -07:00
Steve Block
0a20d6a4c3 Merge "Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set" 2011-09-28 10:11:55 -07:00
Steve Block
85aa944888 Fix HTML5Audio to call WebView.isPrivateBrowsingEnabled() on the UI thread
Bug: 5384494
Change-Id: I2587cf0e898f67becb9dbc2067fb1b0a6a37e124
2011-09-28 14:39:41 +01:00