Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'ed0e11a93afb1f5c8f65edc780902714b6d7fdb0':
  Ensure child is attached before performing measure/layout in Spinner
This commit is contained in:
Alan Viverette
2015-06-23 00:14:12 +00:00
committed by Android Git Automerger
parent e6289de574 ed0e11a93a
commit 84340ab08b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/Spinner.java
View File

@@ -711,9 +711,7 @@ public class Spinner extends AbsSpinner implements OnClickListener {
lp = generateDefaultLayoutParams();
}
if (addChild) {
addViewInLayout(child, 0, lp);
}
addViewInLayout(child, 0, lp);
child.setSelected(hasFocus());
if (mDisableChildrenWhenDisabled) {
@@ -743,6 +741,10 @@ public class Spinner extends AbsSpinner implements OnClickListener {
childRight = childLeft + width;
child.layout(childLeft, childTop, childRight, childBottom);
if (!addChild) {
removeViewInLayout(child);
}
}
@Override