Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set mShiftIsPressed properly when the focus is a plugin.

Browse Source 
Fix for http://b/issue?id=2484986

Change-Id: I3140c3c3a0bd44af85939aceb0bbd07c0861cde4
This commit is contained in:
Leon Scroggins
2010-03-09 14:26:07 -05:00
parent f53774bce6
commit 7a37587664
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/webkit/WebView.java
View File

@@ -3691,11 +3691,13 @@ public class WebView extends AbsoluteLayout
return false;
}
if (mShiftIsPressed == false && nativeCursorWantsKeyEvents() == false
&& !nativeFocusIsPlugin()
&& (keyCode == KeyEvent.KEYCODE_SHIFT_LEFT
|| keyCode == KeyEvent.KEYCODE_SHIFT_RIGHT)) {
setUpSelectXY();
if (keyCode == KeyEvent.KEYCODE_SHIFT_LEFT
|| keyCode == KeyEvent.KEYCODE_SHIFT_RIGHT) {
if (nativeFocusIsPlugin()) {
mShiftIsPressed = true;
} else if (!nativeCursorWantsKeyEvents() && !mShiftIsPressed) {
setUpSelectXY();
}
}
if (keyCode >= KeyEvent.KEYCODE_DPAD_UP
@@ -3834,7 +3836,10 @@ public class WebView extends AbsoluteLayout
if (keyCode == KeyEvent.KEYCODE_SHIFT_LEFT
|| keyCode == KeyEvent.KEYCODE_SHIFT_RIGHT) {
if (commitCopy()) {
if (nativeFocusIsPlugin()) {
mShiftIsPressed = false;
return true;
} else if (commitCopy()) {
return true;
}
}
@@ -4195,7 +4200,9 @@ public class WebView extends AbsoluteLayout
public boolean dispatchKeyEvent(KeyEvent event) {
boolean dispatch = true;
if (!inEditingMode()) {
// Textfields and plugins need to receive the shift up key even if
// another key was released while the shift key was held down.
if (!inEditingMode() && !nativeFocusIsPlugin()) {
if (event.getAction() == KeyEvent.ACTION_DOWN) {
mGotKeyDown = true;
} else {