commit 7acc4a60ca0ddc10d26981e25f6c1e042ce139d6
author Alan Viverette <alanv@google.com> Tue Jun 23 02:53:25 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 23 02:53:25 2015 +0000
tree f5986e7db458d67a7b1ad2d90ca88327e5655e9f
parent de8303b51fa9baa216486aa4b1e7842d9ebbe90f
parent 84340ab08bd61a48072a63f410631256f823945d

am 84340ab0: am ed0e11a9: Merge "Ensure child is attached before performing measure/layout in Spinner" into mnc-dev

* commit '84340ab08bd61a48072a63f410631256f823945d':
  Ensure child is attached before performing measure/layout in Spinner

core/java/android/widget/Spinner.java

diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java
index fdabe91..6abd1293 100644
--- a/core/java/android/widget/Spinner.java
+++ b/core/java/android/widget/Spinner.java
@@ -711,9 +711,7 @@
             lp = generateDefaultLayoutParams();
         }
 
-        if (addChild) {
-            addViewInLayout(child, 0, lp);
-        }
+        addViewInLayout(child, 0, lp);
 
         child.setSelected(hasFocus());
         if (mDisableChildrenWhenDisabled) {
@@ -743,6 +741,10 @@
         childRight = childLeft + width;
 
         child.layout(childLeft, childTop, childRight, childBottom);
+
+        if (!addChild) {
+            removeViewInLayout(child);
+        }
     }
 
     @Override