commit 8814d738ad840ea66f0e5a4733f53f2e3bd8d0eb
author Michael Kolb <kolby@google.com> Wed Jan 26 11:22:30 2011 -0800
committer Michael Kolb <kolby@google.com> Wed Jan 26 11:47:45 2011 -0800
tree 156a640bd64b95378e7c03639236f015837c2661
parent 3e7be7bfecd54374de4fc139a85167b1b5b0cc40

fix quickcontrols

    http://b/issue?id=3394524
    check tab bar state after removing Combo page
    add tab bar state check after animations

Change-Id: I5c3c497c8905ce2d0e069c796c835aff5f2cc21a

src/com/android/browser/TabBar.java

diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java
index 790d162..df2e68a 100644
--- a/src/com/android/browser/TabBar.java
+++ b/src/com/android/browser/TabBar.java
@@ -536,6 +536,7 @@
             public void onAnimationEnd(Animator animation) {
                 mTabs.removeTab(tv);
                 mTabMap.remove(tab);
+                mUi.onRemoveTabCompleted(tab);
             }
 
             @Override
@@ -561,6 +562,7 @@
 
             @Override
             public void onAnimationEnd(Animator animation) {
+                mUi.onAddTabCompleted(tab);
             }
 
             @Override

src/com/android/browser/XLargeUi.java

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 2f27aa1..2aaa029 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -82,6 +82,7 @@
 
     @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 @@
     @Override
     public void addTab(Tab tab) {
         mTabBar.onNewTab(tab);
+    }
+
+    protected void onAddTabCompleted(Tab tab) {
         checkTabCount();
     }
 
@@ -252,6 +256,9 @@
     public void removeTab(Tab tab) {
         super.removeTab(tab);
         mTabBar.onRemoveTab(tab);
+    }
+
+    protected void onRemoveTabCompleted(Tab tab) {
         checkTabCount();
     }