commit c68bf72f47feae1034804bfd5fb02a8667540e3a
author Aurimas Liutikas <aurimas@google.com> Wed Sep 14 04:26:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 14 04:26:41 2016 +0000
tree c00481c6c9263d86c2f28c3ef6fcfe3b467a805b
parent 41217787c11e36e1c566699667c9c1c35f7c57f1
parent 6386de2524238eabaa15ba5f65897dfbc9521d31

Fix SearchView measure for UNSPECIFIED height. am: f6a50be25c am: edaac91993
am: 6386de2524

Change-Id: Iffb9953d25665f8260bcff43040e91cf074ba71c

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;