summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/inputmethodservice/ExtractEditText.java7
-rw-r--r--core/java/android/widget/TextView.java2
2 files changed, 3 insertions, 6 deletions
diff --git a/core/java/android/inputmethodservice/ExtractEditText.java b/core/java/android/inputmethodservice/ExtractEditText.java
index 3447e76c4b9a..44e7e52aec70 100644
--- a/core/java/android/inputmethodservice/ExtractEditText.java
+++ b/core/java/android/inputmethodservice/ExtractEditText.java
@@ -98,11 +98,8 @@ 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)) {
- return true;
- }
+ if (mIME != null && mIME.onExtractTextContextMenuItem(id)) {
+ return true;
}
return super.onTextContextMenuItem(id);
}
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 6b4e4542cd5e..1f67cd677933 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -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();
}