commit 1acef69ffc079d1bc029ff7eb1f5043f7efd7f36
author Michael Kolb <kolby@google.com> Tue Mar 08 14:12:06 2011 -0800
committer Michael Kolb <kolby@google.com> Wed Mar 09 09:37:22 2011 -0800
tree 9e8daece975b283d9866d2c1915cbd86446bb16b
parent 66996bfa98bcf98f2ea944ddd27439f554f8f0b9

add menu options to qc

    Bug 4071315
    Use the standard menu items to popuplate a menu from within quick
    controls

Change-Id: I80d483ab2ce054e9b70ff4c6b0d6e0d9be783dc4

src/com/android/browser/XLargeUi.java

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index d940b50..debb763 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -24,12 +24,15 @@
 import android.app.ActionBar;
 import android.app.Activity;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 import android.view.ActionMode;
 import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.Menu;
 import android.view.View;
 import android.webkit.WebChromeClient.CustomViewCallback;
 import android.webkit.WebView;
@@ -121,15 +124,14 @@
 
     private void checkTabCount() {
         if (mUseQuickControls) {
-            int n = mTabBar.getTabCount();
-            if (n >= 2) {
-                mActionBar.show();
-            } else if (n == 1) {
+            if (mTabControl.getTabCount() == 1) {
                 mHandler.post(new Runnable() {
                     public void run() {
                         mActionBar.hide();
                     }
                 });
+            } else {
+                mActionBar.show();
             }
         }
     }
@@ -503,4 +505,14 @@
         mTitleBar.registerDropdownChangeListener(d);
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        if (mUseQuickControls) {
+            mPieControl.onMenuOpened(menu);
+            return false;
+        } else {
+            return true;
+        }
+    }
+
 }