diff options
author | Guang Zhu <guangzhu@google.com> | 2010-08-26 10:52:27 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-26 10:52:27 -0700 |
commit | fe8eaf3b5dc52cecaf15ccabe9a8717cce701f6c (patch) | |
tree | 0330e99a1fb0f7e2404a73933e802d973fee3f22 /tests | |
parent | efd05ea69a53d73d2dacacd74f6a420cac8ef97b (diff) | |
parent | 1c045003788725b40af5489149ac0fc8bfebb1ea (diff) | |
download | frameworks_base-fe8eaf3b5dc52cecaf15ccabe9a8717cce701f6c.zip frameworks_base-fe8eaf3b5dc52cecaf15ccabe9a8717cce701f6c.tar.gz frameworks_base-fe8eaf3b5dc52cecaf15ccabe9a8717cce701f6c.tar.bz2 |
am 1c045003: Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread
Merge commit '1c045003788725b40af5489149ac0fc8bfebb1ea' into gingerbread-plus-aosp
* commit '1c045003788725b40af5489149ac0fc8bfebb1ea':
add mouse up/down/click support in DumpRenderTree
Diffstat (limited to 'tests')
-rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/WebViewEventSender.java | 58 |
1 files changed, 16 insertions, 42 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/WebViewEventSender.java b/tests/DumpRenderTree/src/com/android/dumprendertree/WebViewEventSender.java index 0c2347d..716086b 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/WebViewEventSender.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/WebViewEventSender.java @@ -16,14 +16,12 @@ package com.android.dumprendertree; -import android.os.Handler; import android.os.SystemClock; import android.util.*; import android.view.KeyEvent; import android.view.MotionEvent; import android.webkit.WebView; -import java.lang.InterruptedException; import java.util.Arrays; import java.util.Vector; @@ -33,7 +31,7 @@ public class WebViewEventSender implements EventSender { WebViewEventSender(WebView webView) { mWebView = webView; - mTouchPoints = new Vector(); + mTouchPoints = new Vector<TouchPoint>(); } public void resetMouse() { @@ -82,47 +80,23 @@ public class WebViewEventSender implements EventSender { mouseUp(); } - public void mouseDown() { - /* KeyEvent event = new KeyEvent( - KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER); - mWebView.onKeyDown(event.getKeyCode(), event); */ - } + public void mouseDown() { + long ts = SystemClock.uptimeMillis(); + MotionEvent event = MotionEvent.obtain(ts, ts, MotionEvent.ACTION_DOWN, mouseX, mouseY, 0); + mWebView.onTouchEvent(event); + } - public void mouseMoveTo(int X, int Y) { - if (X > mouseX) { - KeyEvent event = new KeyEvent( - KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_RIGHT); - mWebView.onKeyDown(event.getKeyCode(), event); - mWebView.onKeyUp(event.getKeyCode(), event); - } else if ( X < mouseX ) { - KeyEvent event = new KeyEvent( - KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_LEFT); - mWebView.onKeyDown(event.getKeyCode(), event); - mWebView.onKeyUp(event.getKeyCode(), event); - } - if (Y > mouseY) { - KeyEvent event = new KeyEvent( - KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_DOWN); - mWebView.onKeyDown(event.getKeyCode(), event); - mWebView.onKeyUp(event.getKeyCode(), event); - } else if (Y < mouseY ) { - KeyEvent event = new KeyEvent( - KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_UP); - mWebView.onKeyDown(event.getKeyCode(), event); - mWebView.onKeyUp(event.getKeyCode(), event); - } - mouseX= X; - mouseY= Y; - - } + public void mouseMoveTo(int X, int Y) { + mouseX= X; + mouseY= Y; + } - public void mouseUp() { - /* KeyEvent event = new KeyEvent( - KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DPAD_CENTER); - mWebView.onKeyDown(event.getKeyCode(), event);*/ + public void mouseUp() { + long ts = SystemClock.uptimeMillis(); + MotionEvent event = MotionEvent.obtain(ts, ts, MotionEvent.ACTION_UP, mouseX, mouseY, 0); + mWebView.onTouchEvent(event); + } - } - // Assumes lowercase chars, case needs to be // handled by calling function. static int keyMapper(char c) { @@ -365,7 +339,7 @@ public class WebViewEventSender implements EventSender { mX = x; mY = y; } - }; + } private Vector<TouchPoint> mTouchPoints; private int mTouchMetaState; |