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

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 80fdcfa..ce993fd 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -17,6 +17,7 @@
 package com.android.browser;
 
 import android.app.Activity;
+import android.os.Bundle;
 import android.util.Log;
 import android.view.ActionMode;
 import android.view.Gravity;
@@ -107,12 +108,16 @@
 
     @Override
     public boolean onMenuKey() {
-        if (mNavScreen == null) {
-            showNavScreen();
+        if (!isComboViewShowing()) {
+            if (mNavScreen == null) {
+                showNavScreen();
+            } else {
+                mNavScreen.close();
+            }
+            return true;
         } else {
-            mNavScreen.close();
+            return false;
         }
-        return true;
     }
 
     @Override
@@ -210,6 +215,14 @@
     }
 
     @Override
+    public void showComboView(boolean startWithHistory, Bundle extras) {
+        if (mNavScreen != null) {
+            hideNavScreen(false);
+        }
+        super.showComboView(startWithHistory, extras);
+    }
+
+    @Override
     public boolean showsWeb() {
         return super.showsWeb() && mActiveTabsPage == null;
     }
@@ -283,15 +296,12 @@
     @Override
     protected void captureTab(final Tab tab) {
         if (tab == null) return;
-        if (mUseQuickControls) {
-            super.captureTab(tab);
-        } else {
-            BrowserWebView web = (BrowserWebView) tab.getWebView();
-            if (web != null) {
-                tab.setScreenshot(web.capture());
-            }
+        BrowserWebView web = (BrowserWebView) tab.getWebView();
+        if (web != null) {
+            tab.setScreenshot(web.capture());
         }
     }
+
     void showNavScreen() {
         detachTab(mActiveTab);
         mNavScreen = new NavScreen(mActivity, mUiController, this);