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

Commit 38143a68 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Bug 5014726: Paste works in ExtractedText"

parents 2aa6c4b5 459ac63a

core/java/android/inputmethodservice/ExtractEditText.java

+2 −5
Original line number Diff line number Diff line
@@ -98,12 +98,9 @@ public class ExtractEditText extends EditText { 
    }

    

    @Override public boolean onTextContextMenuItem(int id) {

        // Horrible hack: select word option has to be handled by original view to work.

        if (mIME != null && id != android.R.id.startSelectingText) {

            if (mIME.onExtractTextContextMenuItem(id)) {

        if (mIME != null && mIME.onExtractTextContextMenuItem(id)) {

            return true;

        }

        }

        return super.onTextContextMenuItem(id);

    }

core/java/android/widget/TextView.java

+1 −1
Original line number Diff line number Diff line
@@ -9441,7 +9441,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        @Override

        public void onClick(View v) {

            if (canPaste()) {

                paste(getSelectionStart(), getSelectionEnd());

                onTextContextMenuItem(ID_PASTE);

            }

            hide();

        }