commit 6d99a3937df0d178a2fa2dba208f18c99cec8be1
author Jamie Gennis <jgennis@google.com> Tue Jun 14 14:15:11 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 14 14:15:11 2011 -0700
tree c354bff052121ea20ae05371c146d22ac56fa059
parent 146a0103f468b15ec3ef7dcee5d16bf808a3ad2e
parent fba5fcf367ddbeb0ab804a60e0cb9bb42f5f7fb0

Merge changes I47f147f8,Id09915c9,Iabc6d27c

* changes:
  SurfaceTexture: increase the test's Surface layer.
  SurfaceTexture: add some RGBA_8888 tests.
  SurfaceTextureClient: minor test refactoring.

core/java/com/android/internal/widget/ActionBarView.java

diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index e3286dd..9d8d361 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -302,6 +302,9 @@
     }
 
     public void setEmbeddedTabView(ScrollingTabContainerView tabs) {
+        if (mTabScrollView != null) {
+            removeView(mTabScrollView);
+        }
         mTabScrollView = tabs;
         mIncludeTabs = tabs != null;
         if (mIncludeTabs && mNavigationMode == ActionBar.NAVIGATION_MODE_TABS) {