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

Commit bbe8ad9d authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Hide SearchView icon when no drawable set"

parents 8facf1aa 53b165ea

core/java/android/widget/SearchView.java

+9 −1
Original line number Diff line number Diff line
@@ -816,7 +816,15 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { 
        mSearchButton.setVisibility(visCollapsed);

        updateSubmitButton(hasText);

        mSearchEditFrame.setVisibility(collapsed ? GONE : VISIBLE);

        mCollapsedIcon.setVisibility(mIconifiedByDefault ? GONE : VISIBLE);



        final int iconVisibility;

        if (mCollapsedIcon.getDrawable() == null || mIconifiedByDefault) {

            iconVisibility = GONE;

        } else {

            iconVisibility = VISIBLE;

        }

        mCollapsedIcon.setVisibility(iconVisibility);



        updateCloseButton();

        updateVoiceButton(!hasText);

        updateSubmitArea();