Commit Graph

2760 Commits

Author SHA1 Message Date
Selim Gurun
faed98a161 Merge "Added annotations for injected accessibility objects" into jb-mr1-dev 2012-09-11 13:23:45 -07:00
Selim Gurun
2fa10c675b Fix build break
Change-Id: Ib5415bbebb849de23b3ff8533a7c1a98f6ae38f4
2012-09-11 11:32:44 -07:00
Selim Gurun
0e9292b94a Remove defunct searchbox implementation from webview.
The search box implementation has not been in use since ICS. This
removes dead code from webview.

Change-Id: I8a28eeeec556619abc4a902a3abec2ac52bad319
2012-09-11 10:40:28 -07:00
Selim Gurun
b743a23fc5 Added annotations for injected accessibility objects
Bug: 7073422

Provided @JavascriptInterface to methods that are accessible from
js.

Change-Id: If3bf8f5aa2b6ff38fe5358aad534ea31f6f546ae
2012-09-11 10:24:44 -07:00
Selim Gurun
94740e6c33 Control access to inherited methods of jsinterface objects
Bug: 7073422

Create the plumbing to use an annotation to allow access to
inherited methods of jsinterface objects. The default webview
behavior has not changed yet. However internally an a flag is
introduced to restrict javascript access to methods that have an annotation.

Change-Id: I41927248e6bc4b09d17c0707c60fe5e6ab681e66
2012-09-10 16:43:35 -07:00
John Reck
095e8aa02b Fix some destroy bugs
Bug: 6961494
 Don't call clearHelpers in destroy(). It is already called
 in onDetach, which is where it needs to be. It can't be
 called by the finalizer

 Switch onCancel listener to onDismiss listener. Fixes an issue
 where destroying can live the webcore thread hung because onCancel
 won't be called, but onDismiss is

Change-Id: I669c389c8c9a81d92c27f88d83bcb711c6c0a5ee
2012-09-10 16:07:04 -07:00
Teng-Hui Zhu
4db5d23dea Merge "Back key to dismiss full screen video" into jb-mr1-dev 2012-09-07 11:49:54 -07:00
Teng-Hui Zhu
5558eacfbf Back key to dismiss full screen video
Also cleanup some warnings.

bug:6722752

Change-Id: Ib612cf79e9546d40a048c5f09a1be6ca37ce51f8
2012-09-06 16:20:14 -07:00
Selim Gurun
18e8768067 Merge "remove defunct javascript interface" into jb-mr1-dev 2012-09-05 15:04:07 -07:00
Selim Gurun
d773ca8ff2 remove defunct javascript interface
Bug: 7073422

The feature that is using search box implementation was removed from
browser after Honeycomb. This is to remove the js interface that
is added for this feature.

Change-Id: I9441d461caf189467e4ad45de958c13b81f4ff17
2012-09-05 11:53:44 -07:00
Adam Powell
1027ed2aca Make WebView track focal points more accurately
Change-Id: I6683edee6933b1dd026453935d72119320ab3c81
2012-09-04 14:42:11 -07:00
John Reck
fef288b01c am 8f58dfa9: am da5cd308: am ae03afda: Merge "onSavePassword dialog can leak when WebViewClassic is destroyed."
* commit '8f58dfa975d01c5c50de513848a6aa8a4460d32c':
  onSavePassword dialog can leak when WebViewClassic is destroyed.
2012-08-30 11:45:47 -07:00
John Reck
da5cd30802 am ae03afda: Merge "onSavePassword dialog can leak when WebViewClassic is destroyed."
* commit 'ae03afda41ace0721e48ed15ce35345bfa033116':
  onSavePassword dialog can leak when WebViewClassic is destroyed.
2012-08-30 11:41:38 -07:00
Johan Redestig
8655e9085c onSavePassword dialog can leak when WebViewClassic is destroyed.
The AlertDialog creates in onSavePassword method leaks if
WebViewClassic is destroyed when the dialog is shown.

Change-Id: I81f20e1dd138467a6413766c0a081b389b334ae0
2012-08-30 10:13:41 +02:00
Selim Gurun
8506ce1a3f Merge "Provide referer to browser on download request." into jb-mr1-dev 2012-08-29 15:39:11 -07:00
Selim Gurun
a36dcfdfe0 Provide referer to browser on download request.
Bug: 6662557

Provide a private API to provide referer to browser for download
requests.

Change-Id: I6ff393caa43e16db12fb5dab38f1f26cd76bf232
2012-08-29 11:50:55 -07:00
John Reck
25b86b6bf0 Remove dead code
Change-Id: Ice4bf3a94743019a8fc8ab04ee3de19f27a9e2c3
2012-08-28 16:24:28 -07:00
John Reck
f920271828 Merge "Protect against focus changes after .destroy()" into jb-mr1-dev 2012-08-27 16:54:18 -07:00
John Reck
1612fab07b Protect against focus changes after .destroy()
Bug: 7026042

Change-Id: I656b612a4b5304225863d3100a98bf2b97d9890d
2012-08-27 16:44:39 -07:00
alanv
c98b34608b Reload page when A11y is on and the JavaScript state changes.
Bug: 6910403
Change-Id: I85af7d2019a02c1a6cc17b0c4930276b7fb69e33
2012-08-27 15:21:09 -07:00
Ben Murdoch
5385752829 Make SslErrorHandler ctor public/@hide.
Allow WebViewProvider implementations to subclass SslErrorHandler
but at the same time maintain API compatibility by @hide'ing the
constructor.

Bug: 6238802
Change-Id: I5de268364ed74e59f62439b8612ab682656a7906
2012-08-23 10:19:59 +01:00
Ben Murdoch
2433fe9f04 Make HttpAuthHandler ctor public/@hide.
The Chromium WebView Provider needs to subclass HttpAuthHandler
so that we can adapt a ChromHttpAuthHandler into an
android.webkit.HttpAuthHandler. Currently the constructor (that
does nothing) is package private. So to satisfy the subclass
requirement, make it public, and to satisfy the API, make it
@hide.

Bug: 7034995
Change-Id: I9846aecacce078696db5be709394afb980eb25a6
2012-08-22 19:46:45 +01:00
Selim Gurun
92b81a3e4b Fix onFindResultReceived API
This is to fix open source bug 36509, i.e.
http://code.google.com/p/android/issues/detail?id=36509
the parameters are swapped.

Change-Id: I6245d254943c7c97e847a241d0069d85118763f7
2012-08-21 18:02:47 -07:00
Selim Gurun
a6d16993eb Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev 2012-08-21 16:12:56 -07:00
Jonathan Dixon
951fcabef6 Small tidy up to getDefaultUserAgent. DO NOT MERGE
- no need for WebSettings to bounce via WebView to get to the factory
- move this static (non-factory) method into the Statics inner class.

Bug: 6329117

Clean cherry pick: d1c4faa5a4

Change-Id: I96807df0171c7308421ca8811cfcb1bf710cb007
2012-08-21 16:08:22 -07:00
Mikhail Naganov
9d5e7aa38d Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE
TextSize is deprecated, so we wouldn't expect from WebViewProvider
implementations to re-implement it in some other way than Android WebView does
it. This also makes recently added TextSize.getValue method redundant.

Clean cherry pick: 1202d66f78

Change-Id: Ib6aecb187f10ac3ec5d12cb839cb814ec0c564fe
2012-08-21 15:52:40 -07:00
John Reck
c2cb8d2263 Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev 2012-08-20 17:33:20 -07:00
John Reck
f2e6115404 Support scrolling layers with the mousewheel
Bug: 6635437
 Fix onGenericAction to support scrolling layers.
 Calling startScrollingLayer detects if there is a layer under
 the mouse pointer, and if so switches to DRAG_LAYER_MODE. Then, calling
 doDrag will correctly handle scrolling the layer in DRAG_LAYER_MODE,
 switching out of DRAG_LAYER_MODE when we hit the end of a layer, and
 scrolling the page if there isn't a layer. It is the method used
 by the touch drag path.

Change-Id: I00be09a63c40caa8fce94134c57db0894a62fef0
2012-08-20 17:13:47 -07:00
George Mount
9af67e8f6c Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev 2012-08-20 13:37:55 -07:00
Jeff Brown
98365d7663 Refactor for multi-display support.
Split WindowManagerImpl into two parts, the WindowManager
interface implementation remains where it is but the global
communications with the window manager are now handled by
the WindowManagerGlobal class.  This change greatly simplifies
the challenge of having separate WindowManager instances
for each Context.

Removed WindowManagerImpl.getDefault().  This represents the
bulk of this change.  Most of the usages of this method were
either to perform global functions (now handled by WindowManagerGlobal)
or to obtain the default display (now handled by DisplayManager).

Explicitly associate each new window with a display and make
the Display object available to the View hierarchy.

Add stubs for some new display manager API features.

Start to split apart the concepts of display id and layer stack.
since they operate at different layers of abstraction.
While it's true that each logical display uniquely corresponds to a
surface flinger layer stack, it is not necessarily the case that
they must use the same ids.  Added Display.getLayerStack()
and started using it in places where it was relatively easy to do.

Change-Id: I29ed909114dec86807c4d3a5059c3fa0358bea61
2012-08-19 22:42:08 -07:00
George Mount
9f410c540a Add getDefaultUserAgent to WebSettings.
Bug 6329117
 Add ability to get the default user-agent without creating
 a WebView. The method is implemented for WebSettingsClassic.

Change-Id: Id15fb57f65875752ccf644481a22b88644635f5d
2012-08-17 15:53:13 -07:00
John Reck
b5622dad65 Remove checkThread() from findAddress
Bug: 6811978
 This doesn't need checked thread safety - static util methods should
 be thread safe.

Change-Id: Ib652d74ced66e3fa332464106a38522cd941a4cd
2012-08-17 13:05:02 -07:00
Steve Block
7bf70dd1ac Merge "Fix alpha value for device orientation" into jb-mr1-dev 2012-08-16 04:38:03 -07:00
Steve Block
d5be055f79 Fix alpha value for device orientation
This seems to have been incorrect since this code was first written for HC. I
can only think that the error was made due to confusion between portrait and
landscape mode as development switched from phones to tablets.

Tested on stingray and prime.

A similar fix will be required for Chrome.

Change-Id: I5da13c489fdb9de340b9e6ea8868c9f1adc15bb2
2012-08-16 11:04:51 +01:00
Michael Jurka
524c878e7e Revert "Merge "Reload page when A11y is on and the JavaScript state changes." into jb-mr1-dev"
This reverts commit 6d00c72433, reversing
changes made to 41bfb75f7c.
2012-08-15 19:39:55 -07:00
Svetoslav Ganov
6d00c72433 Merge "Reload page when A11y is on and the JavaScript state changes." into jb-mr1-dev 2012-08-15 18:30:57 -07:00
Svetoslav Ganov
41bfb75f7c Merge "Only inject accessibility when speaking service enabled." into jb-mr1-dev 2012-08-15 18:29:26 -07:00
George Mount
21029db157 Merge "Number and telephone inputs -- use "Go" instead of "Next"" into jb-mr1-dev 2012-08-15 10:44:07 -07:00
George Mount
68c0c12631 Number and telephone inputs -- use "Go" instead of "Next"
Bug 6988736

Change-Id: I36e85832bdd53ea0f7eb422104966b403b8fbcdd
2012-08-15 10:15:50 -07:00
Steve Block
c723e35336 Clean up JavaDoc for CookieManager
Bug: 5461416
Change-Id: I0ae09943007cf3866daad97a76f5008e61c471ed
2012-08-14 15:54:38 +01:00
Steve Block
27f3e32ee1 Clarify JavaDoc for WebView.loadData()
Bug: 5461416
Change-Id: I3f0955677ea64bb4073c97aabea34096298cd710
2012-08-14 15:54:35 +01:00
alanv
fdfd0d8535 Only inject accessibility when speaking service enabled.
Bug: 6922883
Change-Id: I48d03a2da9bcf7375156c84219802bf20af4ddc6
2012-08-09 18:05:17 -07:00
alanv
92a5be96d8 Reload page when A11y is on and the JavaScript state changes.
Bug: 6910403
Change-Id: I0965d76e76282736d053947eb96be0af32fd6001
2012-08-09 17:47:09 -07:00
George Mount
daceb30bf5 Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev 2012-08-02 16:28:03 -07:00
George Mount
df9cae4de3 Cancel handler for JS unload handler prevents hang.
Bug 6803309
 When the alert dialog raised by the JS unload handler was pressed
 outside the alert region, it was canceled and no response was
 sent back to WebViewCore. This captures the cancel event so that
 WebViewCore doesn't hang.

Change-Id: I0c125e759a252a803c2c77aa9533adef7fa82d3d
2012-08-02 15:14:39 -07:00
George Mount
a99dbde643 Don't restart input in the middle of a batch.
Bug 6854156
 setComposingText is in the middle of a batch and it was resetting
 the InputConnection. When the batch ended, it was closing a
 batch that wasn't open on the new InputConnection. The reset
 turns out not to be necessary anymore -- the LatinIME respects
 the content when setComposingText fails to change anything.

Change-Id: If3352b32ed7b3c90c8dcb3d5ff8d308e82849d85
2012-08-02 09:36:06 -07:00
Teng-Hui Zhu
778029e5c6 Add license info to the HTML5Video files.
Change-Id: I44775bcdcc48d2c024b086098e140dae92f53339
2012-08-01 13:59:39 -07:00
Scott Main
75bea2e8d3 am 7c00f816: am 2f5b61a7: Merge "docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch" into jb-dev
* commit '7c00f81606de1880c3f28e54cea064c3b90da3e7':
  docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch
2012-07-25 15:05:18 -07:00
Mikhail Naganov
500b003ff1 Improve JavaDoc for cache mode constants.
Bug: 5461416
Change-Id: I26c48a6428ff1afb5346eeaa02c5ca74ec95173c
2012-07-25 13:06:14 +01:00
Scott Main
4c359b76f9 docs: fix a bunch of links from javadocs to api guides
and add some attributes to Spinner and Switch

Change-Id: If015ad000c1a36e19904c132e98ebff1ceaf718b
2012-07-24 17:50:48 -07:00