summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/XLargeUi.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/browser/XLargeUi.java')
-rw-r--r--src/com/android/browser/XLargeUi.java20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index d940b5049..debb7633f 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -24,12 +24,15 @@ import android.animation.ObjectAnimator;
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 @@ public class XLargeUi extends BaseUi implements ScrollListener {
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 @@ public class XLargeUi extends BaseUi implements ScrollListener {
mTitleBar.registerDropdownChangeListener(d);
}
+ @Override
+ public boolean onPrepareOptionsMenu(Menu menu) {
+ if (mUseQuickControls) {
+ mPieControl.onMenuOpened(menu);
+ return false;
+ } else {
+ return true;
+ }
+ }
+
}