diff options
| author | Adam Powell <adamp@google.com> | 2011-06-14 13:47:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-14 13:47:45 -0700 |
| commit | 146a0103f468b15ec3ef7dcee5d16bf808a3ad2e (patch) | |
| tree | b627155cafd72e18753e0e680c2371d95437e4e8 /core/java | |
| parent | ff24bf439ff6dfffcbcd1456a24f264f7c40f77a (diff) | |
| parent | e0adac0e72312048c3d874b24bc35d8c43253306 (diff) | |
| download | frameworks_base-146a0103f468b15ec3ef7dcee5d16bf808a3ad2e.zip frameworks_base-146a0103f468b15ec3ef7dcee5d16bf808a3ad2e.tar.gz frameworks_base-146a0103f468b15ec3ef7dcee5d16bf808a3ad2e.tar.bz2 | |
Merge "Fix bug 4551701 - com.android.browser: java.lang.IllegalStateException"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 class ActionBarView extends AbsActionBarView { } public void setEmbeddedTabView(ScrollingTabContainerView tabs) { + if (mTabScrollView != null) { + removeView(mTabScrollView); + } mTabScrollView = tabs; mIncludeTabs = tabs != null; if (mIncludeTabs && mNavigationMode == ActionBar.NAVIGATION_MODE_TABS) { |