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

Commit 7a36ad39 authored by Steven Ng's avatar Steven Ng
Browse files

Don't dismiss keyboard after clicking X button on the widgets search bar 

Test: Enter some queries in the widgets search bar. Click X button. The
      keyboard is still opened after the search queries has been erased.
Bug: 189454318
Change-Id: Icb0501cf36cbf1517e2da24044da44101fa86ed9
parent fa7c98ee

robolectric_tests/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarControllerTest.java

+2 −7
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.launcher3.widget.picker.search; 
import static org.junit.Assert.assertEquals;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -131,18 +130,14 @@ public class WidgetsSearchBarControllerTest { 
    public void cancelSearch_shouldInformSearchModeListenerToClearResultsAndExitSearch() {

        mCancelButton.performClick();



        // 1 time explicitly from the cancel button on click listener.

        // Another from the setText("") the cancel button on click listener causing afterTextChange.

        verify(mSearchModeListener, times(2)).exitSearchMode();

        verify(mSearchModeListener).exitSearchMode();

    }



    @Test

    public void cancelSearch_shouldCancelSearch() {

        mCancelButton.performClick();



        // 1 time explicitly from the cancel button on click listener.

        // Another from the setText("") the cancel button on click listener causing afterTextChange.

        verify(mSearchAlgorithm, times(2)).cancel(true);

        verify(mSearchAlgorithm).cancel(true);

        verifyNoMoreInteractions(mSearchAlgorithm);

    }

src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java

+1 −3
Original line number Diff line number Diff line
@@ -101,10 +101,8 @@ public class WidgetsSearchBarController implements TextWatcher, 


    @Override

    public void clearSearchResult() {

        mSearchAlgorithm.cancel(/* interruptActiveRequests= */ true);

        // Any existing search session will be cancelled by setting text to empty.

        mInput.setText("");

        clearFocus();

        mSearchModeListener.exitSearchMode();

    }



    /**