Commit Graph

2766 Commits

Author SHA1 Message Date
Ben Murdoch
ff85c8892f am 42f78d03: am 4d3a7b07: Merge "Make SslErrorHandler ctor public/@hide." into jb-mr1-dev
* commit '42f78d036483dccfd9893fc375fef46a32bb31fb':
  Make SslErrorHandler ctor public/@hide.
2012-08-24 02:15:38 -07:00
Ben Murdoch
6a49d00307 am a6b7bb21: am ed965a2c: Merge "Make HttpAuthHandler ctor public/@hide." into jb-mr1-dev
* commit 'a6b7bb2131805e88a1e87c1b80b65da896819e6e':
  Make HttpAuthHandler ctor public/@hide.
2012-08-23 02:23:00 -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
cce299a2f4 am d9dad604: am 6479ecd1: Merge "Fix onFindResultReceived API" into jb-mr1-dev
* commit 'd9dad6043c4b239907a47bf97409049e8ba014b0':
  Fix onFindResultReceived API
2012-08-22 09:10:17 -07: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
Jonathan Dixon
d1c4faa5a4 Small tidy up to getDefaultUserAgent
- 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
Change-Id: Ib56d5eaae59cd8d19fb0b71e4b8a41d1c0f5ba09
2012-08-20 19:46:28 -07:00
John Reck
003caf9e43 am d87fd2e1: am c2cb8d22: Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev
* commit 'd87fd2e136b69c0d3f0a5c9d7c923e604d0c576c':
  Support scrolling layers with the mousewheel
2012-08-20 17:37:20 -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
eb9b2c095d am 00d2eba5: am 9af67e8f: Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev
* commit '00d2eba50172a6763f3414c092be05a3b283b851':
  Add getDefaultUserAgent to WebSettings.
2012-08-20 13:43:14 -07:00
George Mount
9af67e8f6c Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev 2012-08-20 13:37:55 -07:00
Jeff Brown
ae56520b36 am aa32f5f0: am 98365d76: Refactor for multi-display support.
* commit 'aa32f5f0db25a1553a353d93274f12432e5d07fc':
  Refactor for multi-display support.
2012-08-19 23:12:23 -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
Jonathan Dixon
1b93e278c6 am 36aa961d: am 9271fa69: Merge "Remove checkThread() from findAddress" into jb-mr1-dev
* commit '36aa961d29840c0103ae61f40de88f55e37eb626':
  Remove checkThread() from findAddress
2012-08-17 13:34:24 -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
665772895c am d6be8eae: am 7bf70dd1: Merge "Fix alpha value for device orientation" into jb-mr1-dev
* commit 'd6be8eae5fece2e93bf16cbb2ac20e307c6c7659':
  Fix alpha value for device orientation
2012-08-16 05:08:48 -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
640dbe2ca7 am 35b88a86: am 524c878e: Revert "Merge "Reload page when A11y is on and the JavaScript state changes." into jb-mr1-dev"
* commit '35b88a86b84adfb4273ab27e84d301d9b826670e':
  Revert "Merge "Reload page when A11y is on and the JavaScript state changes." into jb-mr1-dev"
2012-08-15 19:52:49 -07: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
eec7961804 am eaea38b2: am 6d00c724: Merge "Reload page when A11y is on and the JavaScript state changes." into jb-mr1-dev
* commit 'eaea38b2360d7c54d77107e6cc6aca8d32decc1d':
  Reload page when A11y is on and the JavaScript state changes.
2012-08-15 18:34:40 -07:00
Svetoslav Ganov
30a4e23a32 am e4c2e2f8: am 41bfb75f: Merge "Only inject accessibility when speaking service enabled." into jb-mr1-dev
* commit 'e4c2e2f8779a2c51724da1b8430185fceefc94ea':
  Only inject accessibility when speaking service enabled.
2012-08-15 18:34:36 -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
b046e049ec am bb8bdcd9: am 21029db1: Merge "Number and telephone inputs -- use "Go" instead of "Next"" into jb-mr1-dev
* commit 'bb8bdcd9104a85f4f7e21cb882e766da7aef98d2':
  Number and telephone inputs -- use "Go" instead of "Next"
2012-08-15 10:47:29 -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
ae6cb93477 am 1d15cb0b: am 65dfac3b: Merge "Clean up JavaDoc for CookieManager" into jb-mr1-dev
* commit '1d15cb0b37e4a5d0a7674da3fd321148d2cc1cd1':
  Clean up JavaDoc for CookieManager
2012-08-15 05:06:29 -07:00
Steve Block
9ccdb0461c am 3d935621: am 27f3e32e: Clarify JavaDoc for WebView.loadData()
* commit '3d93562115237d8a893f3e686e44116ba506d57a':
  Clarify JavaDoc for WebView.loadData()
2012-08-14 07:59:11 -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
Mikhail Naganov
ce18fd9510 Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom." 2012-08-08 02:08:58 -07:00
Mikhail Naganov
c70b1f3bd6 Merge "Remove unused BROWSER_TEXT_SIZE_CHANGE log event." 2012-08-08 02:06:36 -07:00
Mikhail Naganov
65e7ace979 Clarify JavaDoc of WebSettings.setAllowFileAccessFromFileURLs.
According to CTS tests (WebSettingsTest.testLocalImageLoads),
local images access is allowed regardless of the state of
AllowFileAccessFromFileURLs.

Bug: 5461416

Change-Id: I71f5c38a6b0f3720c8c369c0e19f379c78ace06f
2012-08-08 10:02:39 +01:00
Mikhail Naganov
1202d66f78 Implement WebSettings.{get|set}TextSize via {get|set}TextZoom.
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.

Change-Id: Ia9d0c743424be0727be6d5df6c7da30514d621b7
2012-08-07 18:26:52 +01:00
Mikhail Naganov
690c6b1925 Remove unused BROWSER_TEXT_SIZE_CHANGE log event.
It turns out that the BROWSER_TEXT_SIZE_CHANGE event isn't listed
in google3/wireless/android/production/checkin_config/root,
which means that statistics on it isn't collected, so the logging
statement doesn't have any useful effect and can be removed to
simplify code.

Change-Id: I66d694cdb13e677bb979f5e962ed2cc8d743bdec
2012-08-07 18:16:17 +01:00
George Mount
ed85b04ebd am 8502ab91: am daceb30b: Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev
* commit '8502ab91bdd8ed34eeebed2daac90dea7b3da0ea':
  Cancel handler for JS unload handler prevents hang.
2012-08-02 16:33:30 -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
12b7b7fea8 am be38cccd: am ed9960ff: Merge "Don\'t restart input in the middle of a batch." into jb-mr1-dev
* commit 'be38cccd91e12576ed994719b6b83371c5749bb9':
  Don't restart input in the middle of a batch.
2012-08-02 15:10:28 -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
cf737484a8 am ca6b44f8: am 3a680382: Merge "Add license info to the HTML5Video files." into jb-mr1-dev
* commit 'ca6b44f8a9c78002f1826d49ced350287831dba4':
  Add license info to the HTML5Video files.
2012-08-01 14:53:10 -07:00
Teng-Hui Zhu
778029e5c6 Add license info to the HTML5Video files.
Change-Id: I44775bcdcc48d2c024b086098e140dae92f53339
2012-08-01 13:59:39 -07:00