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

Pass key modifier state to webcore for touch events and update DRT so it can simulate them.

Browse Source 
Change-Id: Ic5aa8cb0376f6a3eecaa6340d57f28fa97f016bd
This commit is contained in:
Ben Murdoch
2010-02-02 18:20:11 +00:00
parent c0784c749b
commit 8a032a3b29
5 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/DumpRenderTree/src/com/android/dumprendertree/WebViewEventSender.java
View File

@@ -207,7 +207,7 @@ public class WebViewEventSender implements EventSender {
tp.setDownTime(SystemClock.uptimeMillis());
MotionEvent event = MotionEvent.obtain(tp.downTime(), tp.downTime(),
MotionEvent.ACTION_DOWN, tp.getX(), tp.getY(), 0);
MotionEvent.ACTION_DOWN, tp.getX(), tp.getY(), mTouchMetaState);
mWebView.onTouchEvent(event);
}
@@ -223,7 +223,7 @@ public class WebViewEventSender implements EventSender {
}
MotionEvent event = MotionEvent.obtain(tp.downTime(), SystemClock.uptimeMillis(),
MotionEvent.ACTION_MOVE, tp.getX(), tp.getY(), 0);
MotionEvent.ACTION_MOVE, tp.getX(), tp.getY(), mTouchMetaState);
mWebView.onTouchEvent(event);
tp.setMoved(false);
@@ -237,7 +237,7 @@ public class WebViewEventSender implements EventSender {
}
MotionEvent event = MotionEvent.obtain(tp.downTime(), SystemClock.uptimeMillis(),
MotionEvent.ACTION_UP, tp.getX(), tp.getY(), 0);
MotionEvent.ACTION_UP, tp.getX(), tp.getY(), mTouchMetaState);
mWebView.onTouchEvent(event);
if (tp.isReleased()) {
@@ -253,7 +253,7 @@ public class WebViewEventSender implements EventSender {
if (tp.cancelled()) {
MotionEvent event = MotionEvent.obtain(tp.downTime(), SystemClock.uptimeMillis(),
MotionEvent.ACTION_CANCEL, tp.getX(), tp.getY(), 0);
MotionEvent.ACTION_CANCEL, tp.getX(), tp.getY(), mTouchMetaState);
mWebView.onTouchEvent(event);
}
}
@@ -285,8 +285,20 @@ public class WebViewEventSender implements EventSender {
}
public void setTouchModifier(String modifier, boolean enabled) {
// TODO(benm): This needs implementing when Android supports sending key modifiers
// in touch events.
int mask = 0;
if ("alt".equals(modifier.toLowerCase())) {
mask = KeyEvent.META_ALT_ON;
} else if ("shift".equals(modifier.toLowerCase())) {
mask = KeyEvent.META_SHIFT_ON;
} else if ("ctrl".equals(modifier.toLowerCase())) {
mask = KeyEvent.META_SYM_ON;
}
if (enabled) {
mTouchMetaState |= mask;
} else {
mTouchMetaState &= ~mask;
}
}
public void releaseTouchPoint(int id) {
@@ -302,6 +314,10 @@ public class WebViewEventSender implements EventSender {
mTouchPoints.clear();
}
public void clearTouchMetaState() {
mTouchMetaState = 0;
}
private int contentsToWindowX(int x) {
return (int) (x * mWebView.getScale()) - mWebView.getScrollX();
}
@@ -352,4 +368,5 @@ public class WebViewEventSender implements EventSender {
};
private Vector<TouchPoint> mTouchPoints;
private int mTouchMetaState;
}