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

Commit 53b165ea authored by Alan Viverette's avatar Alan Viverette
Browse files

Hide SearchView icon when no drawable set 

Bug: 23511899
Change-Id: Ic2a4622f905779fc713482c60706c727274f9be5
parent fa0f7cdd

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();