From f8d8149501231cb9d44da657792abb15566f76b3 Mon Sep 17 00:00:00 2001 From: Gilles Debunne Date: Fri, 8 Oct 2010 18:23:49 -0700 Subject: Made paste work in ExtractEditText Bug 3064925 Instead of always passing the menu item to the original TextView, do that only for the 'Select word' option. More ExtractEditText magic, but this ZBB so... Change-Id: Ic4cb0526dbb9711e2f13a916b997f480307dcad1 --- core/java/android/inputmethodservice/ExtractEditText.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/core/java/android/inputmethodservice/ExtractEditText.java b/core/java/android/inputmethodservice/ExtractEditText.java index 8a52e40..3447e76 100644 --- a/core/java/android/inputmethodservice/ExtractEditText.java +++ b/core/java/android/inputmethodservice/ExtractEditText.java @@ -18,7 +18,6 @@ package android.inputmethodservice; import android.content.Context; import android.util.AttributeSet; -import android.view.ContextMenu; import android.view.inputmethod.ExtractedText; import android.widget.EditText; @@ -29,7 +28,6 @@ import android.widget.EditText; public class ExtractEditText extends EditText { private InputMethodService mIME; private int mSettingExtractedText; - private boolean mContextMenuShouldBeHandledBySuper = false; public ExtractEditText(Context context) { super(context, null); @@ -99,19 +97,13 @@ public class ExtractEditText extends EditText { return false; } - @Override - protected void onCreateContextMenu(ContextMenu menu) { - super.onCreateContextMenu(menu); - mContextMenuShouldBeHandledBySuper = true; - } - @Override public boolean onTextContextMenuItem(int id) { - if (mIME != null && !mContextMenuShouldBeHandledBySuper) { + // 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; } } - mContextMenuShouldBeHandledBySuper = false; return super.onTextContextMenuItem(id); } -- cgit v1.1