diff options
| author | Adam Powell <adamp@google.com> | 2011-11-21 17:14:56 -0800 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2011-11-21 17:14:56 -0800 |
| commit | 05c8277f3423fd57196b3878d27ac0f1995101a8 (patch) | |
| tree | 3fa96b68afb379a2fcdb766ae0f7831ee2b13f2e /core/java | |
| parent | 7859c1842c1f2e3c43415dfb5337a0b005bdb1c4 (diff) | |
| download | frameworks_base-05c8277f3423fd57196b3878d27ac0f1995101a8.zip frameworks_base-05c8277f3423fd57196b3878d27ac0f1995101a8.tar.gz frameworks_base-05c8277f3423fd57196b3878d27ac0f1995101a8.tar.bz2 | |
Fix bug 5521467 - Monkeys and ActionBar custom tab views
Remove custom tab views from old parents if applicable.
Change-Id: I7892f0f271e91a4fc9e26694557e82b81f3fd31a
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/widget/ScrollingTabContainerView.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/ScrollingTabContainerView.java b/core/java/com/android/internal/widget/ScrollingTabContainerView.java index b7bc366..25b0065 100644 --- a/core/java/com/android/internal/widget/ScrollingTabContainerView.java +++ b/core/java/com/android/internal/widget/ScrollingTabContainerView.java @@ -29,6 +29,7 @@ import android.text.TextUtils.TruncateAt; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; +import android.view.ViewParent; import android.view.animation.DecelerateInterpolator; import android.widget.AdapterView; import android.widget.BaseAdapter; @@ -392,7 +393,11 @@ public class ScrollingTabContainerView extends HorizontalScrollView final ActionBar.Tab tab = mTab; final View custom = tab.getCustomView(); if (custom != null) { - addView(custom); + final ViewParent customParent = custom.getParent(); + if (customParent != this) { + if (customParent != null) ((ViewGroup) customParent).removeView(custom); + addView(custom); + } mCustomView = custom; if (mTextView != null) mTextView.setVisibility(GONE); if (mIconView != null) { |