Index: chrome/android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteEditText.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteEditText.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteEditText.java |
index 1c02a66a87ab0e9236080534ef8fb132d12ee6eb..3bf95c8a21d06eddc4f6e256041a3ab8e7a58e12 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteEditText.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteEditText.java |
@@ -12,6 +12,7 @@ import android.text.Selection; |
import android.text.Spanned; |
import android.text.TextUtils; |
import android.util.AttributeSet; |
+import android.view.KeyEvent; |
import android.view.accessibility.AccessibilityEvent; |
import android.view.accessibility.AccessibilityManager; |
import android.view.accessibility.AccessibilityNodeInfo; |
@@ -53,6 +54,8 @@ public class AutocompleteEditText extends VerticallyFixedEditText { |
private boolean mIgnoreTextChangeFromAutocomplete = true; |
private boolean mLastEditWasDelete; |
+ private boolean mIgnoreImeForTest; |
+ |
public AutocompleteEditText(Context context, AttributeSet attrs) { |
super(context, attrs); |
mAutocompleteSpan = new AutocompleteSpan(); |
@@ -418,6 +421,11 @@ public class AutocompleteEditText extends VerticallyFixedEditText { |
return mInputConnection; |
} |
+ @VisibleForTesting |
+ public void setIgnoreImeForTest(boolean ignore) { |
+ mIgnoreImeForTest = ignore; |
+ } |
+ |
private InputConnectionWrapper mInputConnection = new InputConnectionWrapper(null, true) { |
private final char[] mTempSelectionChar = new char[1]; |
@@ -528,9 +536,16 @@ public class AutocompleteEditText extends VerticallyFixedEditText { |
@VisibleForTesting |
public InputConnection createInputConnection(InputConnection target) { |
mInputConnection.setTarget(target); |
+ if (mIgnoreImeForTest) return null; |
return mInputConnection; |
} |
+ @Override |
+ public boolean dispatchKeyEvent(KeyEvent event) { |
+ if (mIgnoreImeForTest) return true; |
+ return super.dispatchKeyEvent(event); |
+ } |
+ |
private void notifyAutocompleteTextStateChanged(boolean textDeleted, boolean updateDisplay) { |
if (DEBUG) { |
Log.i(TAG, "notifyAutocompleteTextStateChanged: DEL[%b] DIS[%b] IGN[%b]", textDeleted, |