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/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 23594f2..02f1e7c 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1111,6 +1111,10 @@
         if (mTabControl.getCurrentWebView() == null) {
             return;
         }
+        // clear action mode
+        if (isInCustomActionMode()) {
+            endActionMode();
+        }
         Bundle extras = new Bundle();
         // Disable opening in a new window if we have maxed out the windows
         extras.putBoolean(BrowserBookmarksPage.EXTRA_DISABLE_WINDOW,