summaryrefslogtreecommitdiff
path: root/src/com/android/browser/Controller.java
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-01-12 11:09:38 -0800
committerMichael Kolb <kolby@google.com>2011-01-12 14:32:12 -0800
commitbd3dd948312df22888a8a90aef21e3460ba2f0b3 (patch)
tree3477e4a6e62aef2334d0ad6a0a3920573baefa2f /src/com/android/browser/Controller.java
parentfac822d39e1e608618e0dfbda037edeadac154bb (diff)
Close cab before showing ComboPage
http://b/issue?id=3312056 Close action mode before showing the ComboPage Change-Id: I5f3ac135fb4fd72bb0398f713bd12351fab072d0
Diffstat (limited to 'src/com/android/browser/Controller.java')
-rw-r--r--src/com/android/browser/Controller.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 23594f27..02f1e7c4 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1111,6 +1111,10 @@ public class Controller
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,