commit b3417f0a68a1efc64604ea354ae7f856ce79cb16
author John Reck <jreck@google.com> Fri Jan 14 11:01:05 2011 -0800
committer John Reck <jreck@google.com> Fri Jan 14 17:37:01 2011 -0800
tree 455c87606f0f1a97c2c06c7338a5aa29715880e8
parent 231f751049febdb0877ead6364d33d130286cff1

Bookmark UI update

Change-Id: Ibdf7f93f7c5863d7108044dcd40d3866ff02518a

src/com/android/browser/XLargeUi.java

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 1e607a7..9b344ec 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -20,7 +20,6 @@
 
 import android.app.ActionBar;
 import android.app.Activity;
-import android.graphics.Bitmap;
 import android.util.Log;
 import android.view.ActionMode;
 import android.view.Gravity;
@@ -61,9 +60,21 @@
         mFakeTitleBar.setEditable(true);
         mTabBar = new TabBar(mActivity, mUiController, this);
         mActionBar = mActivity.getActionBar();
+        setupActionBar();
+        setUseQuickControls(BrowserSettings.getInstance().useQuickControls());
+    }
+
+    private void setupActionBar() {
+        mActionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
         mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
         mActionBar.setCustomView(mTabBar);
-        setUseQuickControls(BrowserSettings.getInstance().useQuickControls());
+    }
+
+    @Override
+    public void hideComboView() {
+        super.hideComboView();
+        // ComboView changes the action bar, set it back up to what we want
+        setupActionBar();
     }
 
     private void setUseQuickControls(boolean useQuickControls) {