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

Commit 379e8c4f 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

Change-Id: I5f249c9087aefd5172e7f631ef8d2259d21d2e9a
parents f596debd 18fd90ed
Loading
Loading
Loading
Loading
+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) {