commit fceb3598f9f96fb11d580f0f3be470df7c3d2e8b
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Sep 10 00:18:48 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 10 00:18:51 2016 +0000
tree c9489a2addd3d316a43931f3dad883f19649c581
parent a191f7735b652dd02d5056a90517bfa20c73c760
parent f6a50be25ceb253a4857c0e6a0ff1df161c22628

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

core/java/android/widget/SearchView.java

diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
index 5878cad..9139361 100644
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -816,9 +816,11 @@
 
         switch (heightMode) {
             case MeasureSpec.AT_MOST:
-            case MeasureSpec.UNSPECIFIED:
                 height = Math.min(getPreferredHeight(), height);
                 break;
+            case MeasureSpec.UNSPECIFIED:
+                height = getPreferredHeight();
+                break;
         }
         heightMode = MeasureSpec.EXACTLY;