Merge "Fix SearchView measure for UNSPECIFIED height." into nyc-mr1-dev

2016-09-10 00:18:48 +00:00
parent a191f7735b f6a50be25c
commit fceb3598f9
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -816,9 +816,11 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {

        switch (heightMode) {
            case MeasureSpec.AT_MOST:
-            case MeasureSpec.UNSPECIFIED:
                height = Math.min(getPreferredHeight(), height);
                break;
+            case MeasureSpec.UNSPECIFIED:
+                height = getPreferredHeight();
+                break;
        }
        heightMode = MeasureSpec.EXACTLY;