Merge "A few small cleanning-ups." into honeycomb

core/java/android/view/MotionEvent.java

@@ -1569,7 +1569,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
             + " device=" + mDeviceId
             + " source=0x" + Integer.toHexString(mSource)
             + (getPointerCount() > 1 ?
-                " pointerId2=" + getPointerId(1) + " x2=" + getX(2) + " y2=" + getY(2) : "")
+                " pointerId2=" + getPointerId(1) + " x2=" + getX(1) + " y2=" + getY(1) : "")
             + "}";
     }
 

core/java/android/webkit/WebView.java

@@ -498,9 +498,6 @@ public class WebView extends AbsoluteLayout
     // default is not set, the UI will continue handle them.
     private boolean mDeferTouchProcess;
 
-    // if true, multi-touch events will be passed to webkit directly before UI
-    private boolean mDeferMultitouch = false;
-
     // Currently, multi-touch events are sent to WebKit first then back to
     // WebView while single-touch events are handled in WebView first.
     // So there is a chance that a single-touch move event is handled in WebView
@@ -8164,17 +8161,6 @@ public class WebView extends AbsoluteLayout
         mCurrentTouchInterval = interval;
     }
 
-    /**
-     * Toggle whether multi touch events should be sent to webkit
-     * no matter if UI wants to handle it first.
-     *
-     * @hide This is only used by the webkit layout test.
-     */
-    public void setDeferMultiTouch(boolean value) {
-      mDeferMultitouch = value;
-      Log.v(LOGTAG, "set mDeferMultitouch to " + value);
-    }
-
     /**
      *  Update our cache with updatedText.
      *  @param updatedText  The new text to put in our cache.

tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java

@@ -158,10 +158,6 @@ public class TestShellActivity extends Activity implements LayoutTestController
         // WebView::setJsFlags is noop in JSC build.
         mWebView.setJsFlags("--expose_gc");
 
-        // Always send multitouch events to Webkit since the layout test
-        // is only for the Webkit not the browser's UI.
-        mWebView.setDeferMultiTouch(true);
-
         mHandler = new AsyncHandler();
 
         Intent intent = getIntent();

tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java

@@ -372,7 +372,6 @@ public class LayoutTestsExecutor extends Activity {
         webView.setTouchInterval(-1);
 
         webView.clearCache(true);
-        webView.setDeferMultiTouch(true);
 
         WebSettings webViewSettings = webView.getSettings();
         webViewSettings.setAppCacheEnabled(true);