Chromium Code Reviews| Index: content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java |
| diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java |
| index 8ec3f26ae7f5d27085c2e60c2afce103d4181d34..865781fdcd0d81ab63b9845052532c080b2c8d2e 100644 |
| --- a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java |
| +++ b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java |
| @@ -197,6 +197,10 @@ class ImeActivityTestRule extends ContentShellActivityTestRule { |
| + ", input type history: " + Arrays.deepToString(history); |
| } |
| + void performEditorAction(final int action) { |
| + mConnection.performEditorAction(action); |
| + } |
| + |
| void performGo(TestCallbackHelperContainer testCallbackHelperContainer) throws Throwable { |
| final InputConnection inputConnection = mConnection; |
| final Callable<Void> callable = new Callable<Void>() { |
| @@ -262,10 +266,6 @@ class ImeActivityTestRule extends ContentShellActivityTestRule { |
| Assert.assertEquals(compositionEnd, selection.second.end()); |
| } |
| - void resetUpdateSelectionList() { |
| - mInputMethodManagerWrapper.getUpdateSelectionList().clear(); |
| - } |
| - |
| void assertClipboardContents(final Activity activity, final String expectedContents) { |
| CriteriaHelper.pollUiThread(new Criteria() { |
| @Override |
| @@ -530,10 +530,10 @@ class ImeActivityTestRule extends ContentShellActivityTestRule { |
| */ |
| void focusElementAndWaitForStateUpdate(String id) |
| throws InterruptedException, TimeoutException { |
| - resetUpdateSelectionList(); |
| + resetAllStates(); |
| focusElement(id); |
| waitAndVerifyUpdateSelection(0, 0, 0, -1, -1); |
| - resetUpdateSelectionList(); |
| + resetAllStates(); |
| } |
| void focusElement(final String id) throws InterruptedException, TimeoutException { |
| @@ -570,7 +570,7 @@ class ImeActivityTestRule extends ContentShellActivityTestRule { |
| EditorInfo outAttrs) { |
| mTextInputTypeList.add(inputType); |
| mOutAttrs = outAttrs; |
| - return mFactory.initializeAndGet(view, imeAdapter, inputType, inputMode, inputFlags, |
| + return mFactory.initializeAndGet(view, imeAdapter, inputType, inputFlags, inputMode, |
|
AKVT
2017/05/12 13:26:25
I noticed a param miss match here and corrected.
Changwan Ryu
2017/05/12 22:22:02
Good catch! Thanks for fixing this.
dcheng
2017/05/14 02:53:20
FWIW, might be good to see if we can make this mor
|
| selectionStart, selectionEnd, outAttrs); |
| } |