commit dcc1cd118d4db2b47ecd93c00608441375ced6b5
author Michael Kolb <kolby@google.com> Wed Jan 12 14:34:01 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 12 14:34:01 2011 -0800
tree afeae900d2fc6fc1fc72c2d604eb0d8a6ac5ab28
parent bd3dd948312df22888a8a90aef21e3460ba2f0b3
parent 2516c5da22cecb71c87972ea58401aab523c2a7a

Merge "block touch events in ComboPage" into honeycomb

src/com/android/browser/CombinedBookmarkHistoryView.java

diff --git a/src/com/android/browser/CombinedBookmarkHistoryView.java b/src/com/android/browser/CombinedBookmarkHistoryView.java
index 426b34d..0f12353 100644
--- a/src/com/android/browser/CombinedBookmarkHistoryView.java
+++ b/src/com/android/browser/CombinedBookmarkHistoryView.java
@@ -29,8 +29,10 @@
 import android.os.Bundle;
 import android.provider.Browser;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.View.OnTouchListener;
 import android.view.ViewGroup;
 import android.webkit.WebIconDatabase;
 import android.webkit.WebIconDatabase.IconListener;
@@ -46,7 +48,7 @@
 }
 
 public class CombinedBookmarkHistoryView extends LinearLayout
-        implements OnClickListener {
+        implements OnClickListener, OnTouchListener {
 
     final static String STARTING_FRAGMENT = "fragment";
 
@@ -115,6 +117,7 @@
         mActivity = activity;
         mExtras = extras;
         View v = LayoutInflater.from(activity).inflate(R.layout.bookmarks_history, this);
+        v.setOnTouchListener(this);
         Resources res = activity.getResources();
 
 //        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
@@ -258,4 +261,13 @@
         }
         return false;
     }
+
+    /**
+     * capture touch events to prevent them from going to the underlying
+     * WebView
+     */
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        return true;
+    }
 }