| Index: content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| index 44402ca53d71353a66fd6b069de815a7153f0fd5..d9851a103134d17c79ba90fae74927920aacd3f6 100644
|
| --- a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| +++ b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| @@ -117,7 +117,7 @@ public class ImeTest extends ContentShellTestBase {
|
| assertEquals(0, mConnectionFactory.getOutAttrs().initialSelStart);
|
| assertEquals(0, mConnectionFactory.getOutAttrs().initialSelEnd);
|
|
|
| - waitForEventLogs("selectionchange");
|
| + // waitForEventLogs("selectionchange");
|
| clearEventLogs();
|
|
|
| resetAllStates();
|
| @@ -464,18 +464,14 @@ public class ImeTest extends ContentShellTestBase {
|
| waitForKeyboardStates(2, 1, 3, new Integer[] {TextInputType.NUMBER, TextInputType.NUMBER});
|
|
|
| focusElement("input_text");
|
| - // showSoftInput() on input_text. restartInput() on input_number1 due to focus change,
|
| - // and restartInput() on input_text later.
|
| - // TODO(changwan): reduce unnecessary restart input.
|
| - waitForKeyboardStates(3, 1, 5, new Integer[] {
|
| - TextInputType.NUMBER, TextInputType.NUMBER, TextInputType.NUMBER,
|
| - TextInputType.TEXT});
|
| + // showSoftInput() on input_text. restartInput() on input_text.
|
| + waitForKeyboardStates(3, 1, 4, new Integer[] {
|
| + TextInputType.NUMBER, TextInputType.NUMBER, TextInputType.TEXT});
|
|
|
| focusElement("input_radio", false);
|
| // hideSoftInput(), restartInput()
|
| - waitForKeyboardStates(3, 2, 6, new Integer[] {
|
| - TextInputType.NUMBER, TextInputType.NUMBER, TextInputType.NUMBER,
|
| - TextInputType.TEXT});
|
| + waitForKeyboardStates(3, 2, 5, new Integer[] {
|
| + TextInputType.NUMBER, TextInputType.NUMBER, TextInputType.TEXT});
|
| }
|
|
|
| private void assertTextsAroundCursor(
|
|
|