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

Commit 866c9692 authored by Diksha Gohlyan's avatar Diksha Gohlyan Committed by Automerger Merge Worker
Browse files

Merge "Change padding around close in search view" into rvc-dev am: 18fd90ed am: 5c16d297 

Change-Id: Ifccb94db0d3e2a5b668bfca12e81e2f526537e83
parents 37d6119c 5c16d297

src/com/android/documentsui/queries/SearchViewManager.java

+8 −0
Original line number Diff line number Diff line
@@ -221,6 +221,9 @@ public class SearchViewManager implements 
        mSearchView.setOnQueryTextFocusChangeListener(this);

        final View clearButton = mSearchView.findViewById(R.id.search_close_btn);

        if (clearButton != null) {

            clearButton.setPadding(clearButton.getPaddingStart() + getPixelForDp(4),

                    clearButton.getPaddingTop(), clearButton.getPaddingEnd() + getPixelForDp(4),

                    clearButton.getPaddingBottom());

            clearButton.setOnClickListener(v -> {

                mSearchView.setQuery("", false);

                mSearchView.requestFocus();
@@ -334,6 +337,11 @@ public class SearchViewManager implements 
        return false;

    }



    private int getPixelForDp(int dp) {

        final float scale = mSearchView.getContext().getResources().getDisplayMetrics().density;

        return (int) (dp * scale + 0.5f);

    }



    private void cancelQueuedSearch() {

        synchronized (mSearchLock) {

            if (mQueuedSearchTask != null) {