Merge "fix quickcontrols" into honeycomb

2 files changed, 9 insertions, 0 deletions

diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java
index 790d16291..df2e68a67 100644
--- a/src/com/android/browser/TabBar.java
+++ b/src/com/android/browser/TabBar.java
@@ -536,6 +536,7 @@ public class TabBar extends LinearLayout
             public void onAnimationEnd(Animator animation) {
                 mTabs.removeTab(tv);
                 mTabMap.remove(tab);
+                mUi.onRemoveTabCompleted(tab);
             }
 
             @Override
@@ -561,6 +562,7 @@ public class TabBar extends LinearLayout
 
             @Override
             public void onAnimationEnd(Animator animation) {
+                mUi.onAddTabCompleted(tab);
             }
 
             @Override
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 2f27aa10b..2aaa0293b 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -82,6 +82,7 @@ public class XLargeUi extends BaseUi implements ScrollListener {
 
     @Override
     public void hideComboView() {
+        checkTabCount();
         super.hideComboView();
         // ComboView changes the action bar, set it back up to what we want
         setupActionBar();
@@ -210,6 +211,9 @@ public class XLargeUi extends BaseUi implements ScrollListener {
     @Override
     public void addTab(Tab tab) {
         mTabBar.onNewTab(tab);
+    }
+
+    protected void onAddTabCompleted(Tab tab) {
         checkTabCount();
     }
 
@@ -252,6 +256,9 @@ public class XLargeUi extends BaseUi implements ScrollListener {
     public void removeTab(Tab tab) {
         super.removeTab(tab);
         mTabBar.onRemoveTab(tab);
+    }
+
+    protected void onRemoveTabCompleted(Tab tab) {
         checkTabCount();
     }