diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-02-22 16:54:14 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2010-02-23 10:02:58 -0500 |
| commit | 4e9f89b0a64395133b9160dcb4533d2dc62a424f (patch) | |
| tree | bb4e02658f77c04937f5cdb829170652f63c9935 /src | |
| parent | ab1655e799a3b0a82cea62e05b4017c21ab53881 (diff) | |
| download | packages_apps_Browser-4e9f89b0a64395133b9160dcb4533d2dc62a424f.tar.gz packages_apps_Browser-4e9f89b0a64395133b9160dcb4533d2dc62a424f.tar.bz2 packages_apps_Browser-4e9f89b0a64395133b9160dcb4533d2dc62a424f.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 3 | ||||
| -rw-r--r-- | src/com/android/browser/TitleBar.java | 3 |
2 files changed, 5 insertions, 1 deletions
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 |