commit ac35bdc798173ca536e57c1e4541cef11d78983a
author Michael Kolb <kolby@google.com> Mon Jan 17 17:06:04 2011 -0800
committer Michael Kolb <kolby@google.com> Tue Jan 18 10:20:09 2011 -0800
tree 4730404d9336f3c3f2c558799d15d45b60d4340b
parent 0e64d3c230a0fafff311d39c52b043ef137bf318

show action bar in combo page

     http://b/issue?id=3362812
     ensure action bar is shown when combo page is out

Change-Id: I199672f0e3ee609dcf58f8bb650fa953dd8c25b7

src/com/android/browser/XLargeUi.java

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 9b344ec..d50d94e 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -20,6 +20,7 @@
 
 import android.app.ActionBar;
 import android.app.Activity;
+import android.os.Bundle;
 import android.util.Log;
 import android.view.ActionMode;
 import android.view.Gravity;
@@ -71,6 +72,14 @@
     }
 
     @Override
+    public void showComboView(boolean startWithHistory, Bundle extras) {
+        super.showComboView(startWithHistory, extras);
+        if (mUseQuickControls) {
+            mActionBar.show();
+        }
+    }
+
+    @Override
     public void hideComboView() {
         super.hideComboView();
         // ComboView changes the action bar, set it back up to what we want