Merge "Fix clicking on a fake element (address, phone number, etc..)" into jb-dev

jreck · Android (Google) Code Review · commit eaca069aff71 · 2012-05-03T09:59:46.000-07:00
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
@@ -1316,6 +1316,12 @@ private void onHandleUiEvent(MotionEvent event, int eventType, int flags) {
         case WebViewInputDispatcher.EVENT_TYPE_TOUCH:
             onHandleUiTouchEvent(event);
             break;
+        case WebViewInputDispatcher.EVENT_TYPE_CLICK:
+            if (mFocusedNode != null && mFocusedNode.mIntentUrl != null) {
+                mWebView.playSoundEffect(SoundEffectConstants.CLICK);
+                overrideLoading(mFocusedNode.mIntentUrl);
+            }
+            break;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1316,6 +1316,12 @@ private void onHandleUiEvent(MotionEvent event, int eventType, int flags) {`
`1316`	`1316`	`case WebViewInputDispatcher.EVENT_TYPE_TOUCH:`
`1317`	`1317`	`onHandleUiTouchEvent(event);`
`1318`	`1318`	`break;`
	`1319`	`+ case WebViewInputDispatcher.EVENT_TYPE_CLICK:`
	`1320`	`+ if (mFocusedNode != null && mFocusedNode.mIntentUrl != null) {`
	`1321`	`+ mWebView.playSoundEffect(SoundEffectConstants.CLICK);`
	`1322`	`+ overrideLoading(mFocusedNode.mIntentUrl);`
	`1323`	`+ }`
	`1324`	`+ break;`
`1319`	`1325`	`}`
`1320`	`1326`	`}`
`1321`	`1327`