commit 4bd767d2f4ce166a44687170c6af18e242447205
author Michael Kolb <kolby@google.com> Fri May 27 11:33:55 2011 -0700
committer Michael Kolb <kolby@google.com> Fri May 27 15:35:58 2011 -0700
tree b263020c261f414b0a3e927861c775d6d0d93b1a
parent 2814a362c21ac219410d9b54e1bd3e8152b845c7

long axis scrolling for nav screen

     also:
     fix combo view navscreen overlap
     fix menu key handling
     adjust screenshot capture size

Change-Id: Ia0c920ed40e7d97d5902d98b85830817b9de6506

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index e20a876..ee40a93 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -16,12 +16,6 @@
 
 package com.android.browser;
 
-import com.android.browser.IntentHandler.UrlData;
-import com.android.browser.UI.DropdownChangeListener;
-import com.android.browser.provider.BrowserProvider;
-import com.android.browser.search.SearchEngine;
-import com.android.common.Search;
-
 import android.app.Activity;
 import android.app.DownloadManager;
 import android.app.SearchManager;
@@ -81,6 +75,12 @@
 import android.webkit.WebView;
 import android.widget.Toast;
 
+import com.android.browser.IntentHandler.UrlData;
+import com.android.browser.UI.DropdownChangeListener;
+import com.android.browser.provider.BrowserProvider;
+import com.android.browser.search.SearchEngine;
+import com.android.common.Search;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.net.URLEncoder;
@@ -1242,8 +1242,8 @@
         }
     }
 
-    protected void onMenuKey() {
-        mUi.onMenuKey();
+    protected boolean onMenuKey() {
+        return mUi.onMenuKey();
     }
 
     // menu handling and state
@@ -2465,8 +2465,12 @@
         // Even if MENU is already held down, we need to call to super to open
         // the IME on long press.
         if (KeyEvent.KEYCODE_MENU == keyCode) {
-            event.startTracking();
-            return true;
+            if (mOptionsMenuHandler != null) {
+                return false;
+            } else {
+                event.startTracking();
+                return true;
+            }
         }
         if (!noModifiers
                 && ((KeyEvent.KEYCODE_MENU == keyCode)
@@ -2594,8 +2598,7 @@
         if (KeyEvent.KEYCODE_MENU == keyCode) {
             mMenuIsDown = false;
             if (event.isTracking() && !event.isCanceled()) {
-                onMenuKey();
-                return true;
+                return onMenuKey();
             }
         }
         if (!event.hasNoModifiers()) return false;