Merge commit 'e8a1f6af96d09d8105621932073d6f79e24a5dc9'
* commit 'e8a1f6af96d09d8105621932073d6f79e24a5dc9':
Set organizations to be null for generateKeyPair to use the default.
Merge commit '3af8e9389e008c0076b86cc6b3c6f005e7473d10'
* commit '3af8e9389e008c0076b86cc6b3c6f005e7473d10':
Change addCertificate to take byte[] instead of String as we don't know the encoding.
Merge commit 'e0b7e916a1259d2dd9c116695607f9877ec56056'
* commit 'e0b7e916a1259d2dd9c116695607f9877ec56056':
Replace the dummy code with Keystore for <keygen> support.
Pass moveGeneration to setScrollOffset so it can
generate mouseMove event
Remove node from event messages (no longer used)
Remove CursorData ignoreNullFocus parameter (no longer used)
Fix debug message range
As with the recent change to make a touch bring up the WebTextView,
so that the trackball can be used, and we get text editing goodness,
we also need to bring up the WebTextView when clicking the trackball.
Also do not call overrideUrlLoading for an input field and add a
comment.
The old code put the textfield in focus, and resulted in editing
the text semi-appropriately, but now we actually bring up the
WebTextView so that we properly handle the arrow keys, as well
as any substitution that is necessary. This fixes
http://b/issue?id=1918883
Make the blinking caret active when the user actually starts editing
text. To be consistent with that idea, do not rebuild the WebTextView
when the WebView regains focus. Now sendMouseMoveIfLatest takes a
boolean parameter to determine whether to make the focusController
inactive. Requires a matching change in webkit to pass a parameter
to the method. Now that we only call setFocusControllerActive with
false, change the method to no longer take a boolean parameter.
Change names to reflect that.
This change also reflects a behavioral change. If the WebView or
its window lose focus, we do not restore the blinking caret when
focus returns.
Merge commit '3adf7678cdf8fa955627e096bb5c27b94adc3079'
* commit '3adf7678cdf8fa955627e096bb5c27b94adc3079':
Add permission test structure for private framework permissions.
Add <keygen> support for VPN.
Hashmaps used to pass parameters between WebView.java and
WebViewCore.java are fragile and sometimes require boxing.
Replace them with static classes that are typesafe and use
less code.
Distinguish between clearing the cursor (causing the next
trackball navigation to start at the page edge) and hiding
the cursor (preventing it from drawing, but leaving it at
the same position).
Remove the zoom overview and 1x buttons from the ZoomButtonsController,
since the functionality will now be placed elsewhere. Make zoomScrollOut
and canZoomScrollOut public (albeit hidden), so they can be called by the
Browser. Also rename ExtendedZoomControls' mZoomControls to
mPlusMinusZoomControls so they are not confused with WebView's mZoomControls.
In the old navigation model, we set focus to a node, and checked to see
if that node was still valid (could have changed since we built the
navigation cache). Then we sent a message back to the UI thread to
tell it to draw the ring differently. In the new model, we are essentially
moving a mouse, so we do not concern ourselves with whether the node is
valid. Removed all the code for passing the message to the UI thread
and calling into native. Needs a change to external/webkit to work
properly.
Also, set focusControllerActive state based on presence of
focus and cursor that wants key events.
Disable focusControllerActive when moved cursor wants key
events.
Remove unused recompute-focus code.
Previously, many methods, variables, etc referred to the focus.
Now, they have been changed to refer to the cursor when
appropriate. Some references were changed to the focusCandidate,
since they may apply to either the focus or the cursor, which
is a candidate for focus. Also removed unneeded method
unblockFocus. WebView will not work without a corresponding
change in external/webkit.
This will enable the IME to enable/disable prediction features
for browser fields where the exact type is not very well defined.
Part of the fix for #1743620
WebView was (incorrectly) handling the ENTER key as if it could start
a long press like CENTER key does. Separate the two behaviors. Now,
the ENTER key does not do anything unless it is part of a textfield or
the DOM otherwise handles it.
As a result, I was able to remove some orphaned code. Before this
change, pressing ENTER would play a click noise, and animate the
focus ring as if its link were being followed, but do nothing. In
WebViewCore, do not pass the ENTER key back to the Activity.
Remove NO_FOCUS_CHANGE_BLOCK and BLOCK_FOCUS_CHANGE_UNTIL_KEY_UP, which were
part of SET_FINAL_FOCUS (which is no longer used) from WebViewCore. In WebView,
do not pass BLOCK_FOCUS_CHANGE_UNTIL_KEY_UP with SET_MOVE_MOUSE, since the
receiver does not care about it.
Rename the TextDialog to be a more accurate description of what it is.
Also rename some methods and variables which pertain to it, and preload
the newly created class.
Older code treated the trackball as a four way dpad with
equivalents to moving up, down, left and right by generating
arrow key events. This change makes the trackball solely
generate mousemove events.
The old arrow keys in turn were mapped to be as close as
possible to tab-key events that moved the focus. The new
model leaves focus-changes to the DOM.
Clicking the dpad is distinguished from pressing the enter
key to be more compatible with desktop-authored web pages.
Merge commit 'ff686ce11e952a9001b1384d8e7d82127b0529a2'
* commit 'ff686ce11e952a9001b1384d8e7d82127b0529a2':
Change when gestures listeners are fired.
Manual merge from cupcake_dcm. internal CL#148693. Two donottranslate.xml-s are already submitted.
