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

am 1c045003: Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread

Browse Source 
Merge commit '1c045003788725b40af5489149ac0fc8bfebb1ea' into gingerbread-plus-aosp

* commit '1c045003788725b40af5489149ac0fc8bfebb1ea':
  add mouse up/down/click support in DumpRenderTree
This commit is contained in:
Guang Zhu
2010-08-26 10:52:27 -07:00
committed by Android Git Automerger
parent efd05ea69a 1c04500378
commit fe8eaf3b5d
1 changed files with 16 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,14 +16,12 @@
package com.android.dumprendertree; package com.android.dumprendertree;
import android.os.Handler;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.*; import android.util.*;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.webkit.WebView; import android.webkit.WebView;
import java.lang.InterruptedException;
import java.util.Arrays; import java.util.Arrays;
import java.util.Vector; import java.util.Vector;
@@ -33,7 +31,7 @@ public class WebViewEventSender implements EventSender {
WebViewEventSender(WebView webView) { WebViewEventSender(WebView webView) {
mWebView = webView; mWebView = webView;
mTouchPoints = new Vector(); mTouchPoints = new Vector<TouchPoint>();
} }
public void resetMouse() { public void resetMouse() {
@@ -82,47 +80,23 @@ public class WebViewEventSender implements EventSender {
mouseUp(); mouseUp();
} }
public void mouseDown() { public void mouseDown() {
/* KeyEvent event = new KeyEvent( long ts = SystemClock.uptimeMillis();
KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER); MotionEvent event = MotionEvent.obtain(ts, ts, MotionEvent.ACTION_DOWN, mouseX, mouseY, 0);
mWebView.onKeyDown(event.getKeyCode(), event); */ mWebView.onTouchEvent(event);
} }
public void mouseMoveTo(int X, int Y) { public void mouseMoveTo(int X, int Y) {
if (X > mouseX) { mouseX= X;
KeyEvent event = new KeyEvent( mouseY= Y;
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 mouseUp() { public void mouseUp() {
/* KeyEvent event = new KeyEvent( long ts = SystemClock.uptimeMillis();
KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DPAD_CENTER); MotionEvent event = MotionEvent.obtain(ts, ts, MotionEvent.ACTION_UP, mouseX, mouseY, 0);
mWebView.onKeyDown(event.getKeyCode(), event);*/ mWebView.onTouchEvent(event);
}
}
// Assumes lowercase chars, case needs to be // Assumes lowercase chars, case needs to be
// handled by calling function. // handled by calling function.
static int keyMapper(char c) { static int keyMapper(char c) {
@@ -365,7 +339,7 @@ public class WebViewEventSender implements EventSender {
mX = x; mX = x;
mY = y; mY = y;
} }
}; }
private Vector<TouchPoint> mTouchPoints; private Vector<TouchPoint> mTouchPoints;
private int mTouchMetaState; private int mTouchMetaState;