Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6386de25 authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by android-build-merger
Browse files

Fix SearchView measure for UNSPECIFIED height. am: f6a50be2 

am: edaac919

Change-Id: I57f3e96c94803d4dbc7b57fd0feb5a80a8253906
parents 03cc5256 edaac919

core/java/android/widget/SearchView.java

+3 −1
Original line number Diff line number Diff line
@@ -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;