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

Commit 7e9f62ef authored by George Mount's avatar George Mount
Browse files

Use setCustomSelectActionModeCallback to disallow action bar. 

 Bug 5993716
 Use setCustomSelectActionModeCallback rather than
 setLongClickListener to disallow custom action block so
 that long press can bring up the paste window.

Change-Id: I916e77dcea7914c02191f0ecda37cd126318807d
parent b72ac9dd

core/java/android/webkit/FindActionModeCallback.java

+22 −9
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import android.widget.EditText; 
import android.widget.TextView;



class FindActionModeCallback implements ActionMode.Callback, TextWatcher,

        View.OnLongClickListener, View.OnClickListener {

        View.OnClickListener {

    private View mCustomView;

    private EditText mEditText;

    private TextView mMatches;
@@ -51,9 +51,7 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher, 
                com.android.internal.R.layout.webview_find, null);

        mEditText = (EditText) mCustomView.findViewById(

                com.android.internal.R.id.edit);

        // Override long click so that select ActionMode is not opened, which

        // would exit find ActionMode.

        mEditText.setOnLongClickListener(this);

        mEditText.setCustomSelectionActionModeCallback(new NoAction());

        mEditText.setOnClickListener(this);

        setText("");

        mMatches = (TextView) mCustomView.findViewById(
@@ -174,11 +172,6 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher, 
        mMatches.setVisibility(View.VISIBLE);

    }



    // OnLongClickListener implementation



    @Override

    public boolean onLongClick(View v) { return true; }



    // OnClickListener implementation



    @Override
@@ -280,4 +273,24 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher, 
        return mGlobalVisibleRect.bottom;

    }



    public static class NoAction implements ActionMode.Callback {

        @Override

        public boolean onCreateActionMode(ActionMode mode, Menu menu) {

            return false;

        }



        @Override

        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {

            return false;

        }



        @Override

        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {

            return false;

        }



        @Override

        public void onDestroyActionMode(ActionMode mode) {

        }

    }

}