From 4e9f89b0a64395133b9160dcb4533d2dc62a424f Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Mon, 22 Feb 2010 16:54:14 -0500 Subject: When long pressing on title bar, do not use WebView in onCreateContextMenu Fix for http://b/issue?id=2456405 Override TitleBar::createContextMenu to call BrowserActivity's onCreateContextMenu directly, so that WebView is ignored, and we only get the options for TitleBar. --- src/com/android/browser/BrowserActivity.java | 3 +++ src/com/android/browser/TitleBar.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/com') diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 52a31258b..fc337f9cf 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -1693,6 +1693,9 @@ public class BrowserActivity extends Activity @Override public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { + if (v instanceof TitleBar) { + return; + } WebView webview = (WebView) v; WebView.HitTestResult result = webview.getHitTestResult(); if (result == null) { diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java index 15b1d4413..98667c344 100644 --- a/src/com/android/browser/TitleBar.java +++ b/src/com/android/browser/TitleBar.java @@ -141,9 +141,10 @@ public class TitleBar extends LinearLayout { }; @Override - protected void onCreateContextMenu(ContextMenu menu) { + public void createContextMenu(ContextMenu menu) { MenuInflater inflater = mBrowserActivity.getMenuInflater(); inflater.inflate(R.menu.title_context, menu); + mBrowserActivity.onCreateContextMenu(menu, this, null); } @Override -- cgit v1.2.3