diff options
| author | Ben Murdoch <benm@google.com> | 2010-02-02 18:20:11 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-02-19 11:47:31 +0000 |
| commit | 8a032a3b29e7708e468e2078ff88a39e083db1da (patch) | |
| tree | b6327286679762a81a7cc03fdf78fde84062ce2d /tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java | |
| parent | c0784c749bb36c9746acd8fe5fe26b3205104d22 (diff) | |
Pass key modifier state to webcore for touch events and update DRT so it can simulate them.
Change-Id: Ic5aa8cb0376f6a3eecaa6340d57f28fa97f016bd
Diffstat (limited to 'tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java')
| -rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java b/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java index 50451e75ae41..ce1bf8de9e45 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java @@ -47,6 +47,7 @@ public class CallbackProxy extends Handler implements EventSender, LayoutTestCon private static final int EVENT_RELEASE_TOUCH_POINT = 16; private static final int EVENT_CLEAR_TOUCH_POINTS = 17; private static final int EVENT_CANCEL_TOUCH_POINT = 18; + private static final int EVENT_SET_TOUCH_MODIFIER = 19; private static final int LAYOUT_CLEAR_LIST = 20; private static final int LAYOUT_DISPLAY = 21; @@ -145,6 +146,13 @@ public class CallbackProxy extends Handler implements EventSender, LayoutTestCon mEventSender.updateTouchPoint(id, x, y); break; + case EVENT_SET_TOUCH_MODIFIER: + Bundle modifierArgs = (Bundle) msg.obj; + String modifier = modifierArgs.getString("modifier"); + boolean enabled = modifierArgs.getBoolean("enabled"); + mEventSender.setTouchModifier(modifier, enabled); + break; + case EVENT_RELEASE_TOUCH_POINT: mEventSender.releaseTouchPoint(msg.arg1); break; @@ -320,7 +328,10 @@ public class CallbackProxy extends Handler implements EventSender, LayoutTestCon } public void setTouchModifier(String modifier, boolean enabled) { - // TODO(benm): Android doesn't support key modifiers on touch events yet. + Bundle map = new Bundle(); + map.putString("modifier", modifier); + map.putBoolean("enabled", enabled); + obtainMessage(EVENT_SET_TOUCH_MODIFIER, map).sendToTarget(); } public void touchMove() { |