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

Commit fceb3598 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents a191f773 f6a50be2

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;