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

Commit cf72ab4d authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Don't show the submit button when it isn't enabled. 

There was a particular scenario where it was being shown even if it's disabled.

Bug: 5412759
Change-Id: I34edd385062bed48bccef35e8240932d4cc96fd1
parent 45a04db3

core/java/android/widget/SearchView.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -728,7 +728,8 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { 




    private void updateSubmitButton(boolean hasText) {

    private void updateSubmitButton(boolean hasText) {

        int visibility = GONE;

        int visibility = GONE;

        if (isSubmitAreaEnabled() && hasFocus() && (hasText || !mVoiceButtonEnabled)) {

        if (mSubmitButtonEnabled && isSubmitAreaEnabled() && hasFocus()

                && (hasText || !mVoiceButtonEnabled)) {

            visibility = VISIBLE;

            visibility = VISIBLE;

        }

        }

        mSubmitButton.setVisibility(visibility);

        mSubmitButton.setVisibility(visibility);
@@ -1082,9 +1083,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { 
        CharSequence text = mQueryTextView.getText();

        CharSequence text = mQueryTextView.getText();

        mUserQuery = text;

        mUserQuery = text;

        boolean hasText = !TextUtils.isEmpty(text);

        boolean hasText = !TextUtils.isEmpty(text);

        if (isSubmitButtonEnabled()) {

        updateSubmitButton(hasText);

        updateSubmitButton(hasText);

        }

        updateVoiceButton(!hasText);

        updateVoiceButton(!hasText);

        updateCloseButton();

        updateCloseButton();

        updateSubmitArea();

        updateSubmitArea();