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

Commit f6a50be2 authored by Aurimas Liutikas's avatar Aurimas Liutikas
Browse files

Fix SearchView measure for UNSPECIFIED height. 

Previously it would almost always force SearchView to become 0
when height mode was UNSPECIFIED.

Bug: 31302290
Change-Id: Icd2116b84951b1b967666147dbc5762d996408e6
parent 6c997934

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;