Implement ThreadedInputConnection.deleteSurroundingTextInCodePoints()

content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser.input;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Handler;
 import android.support.test.filters.MediumTest;
 import android.support.test.filters.SmallTest;
 import android.text.InputType;
 import android.text.TextUtils;
@@ skipping 190 matching lines @@
 
         deleteSurroundingText(0, 10);
         assertTextsAroundCursor("", null, "");
 
         deleteSurroundingText(10, 10);
         assertTextsAroundCursor("", null, "");
     }
 
     @SmallTest
     @Feature({"TextInput", "Main"})
+    public void testDeleteSurroundingTextInCodePointsWithRangeSelection() throws Throwable {
+        commitText("hello", 1);

[Changwan Ryu, 2017/01/11 02:00:27]

could you use an example where the text contains a surrogate pair and you 
delete the pair as a whole? (partially removal is also fine with some note)

[yabinh, 2017/01/24 11:39:56]

Done.

+        waitAndVerifyUpdateSelection(0, 5, 5, -1, -1);
+
+        setSelection(1, 4);
+        waitAndVerifyUpdateSelection(1, 1, 4, -1, -1);
+
+        deleteSurroundingTextInCodePoints(0, 0);
+        assertTextsAroundCursor("h", "ell", "o");
+
+        deleteSurroundingTextInCodePoints(1, 1);
+        assertTextsAroundCursor("", "ell", "");
+
+        deleteSurroundingTextInCodePoints(1, 0);
+        assertTextsAroundCursor("", "ell", "");
+
+        deleteSurroundingTextInCodePoints(0, 1);
+        assertTextsAroundCursor("", "ell", "");
+    }
+
+    @SmallTest
+    @Feature({"TextInput", "Main"})
+    public void testDeleteSurroundingTextInCodePointsWithCursorSelection() throws Throwable {
+        commitText("hello", 1);
+        waitAndVerifyUpdateSelection(0, 5, 5, -1, -1);
+
+        setSelection(2, 2);
+        waitAndVerifyUpdateSelection(1, 2, 2, -1, -1);
+
+        deleteSurroundingTextInCodePoints(0, 0);
+        assertTextsAroundCursor("he", null, "llo");
+
+        deleteSurroundingTextInCodePoints(1, 1);
+        assertTextsAroundCursor("h", null, "lo");
+
+        deleteSurroundingTextInCodePoints(1, 0);
+        assertTextsAroundCursor("", null, "lo");
+
+        deleteSurroundingTextInCodePoints(0, 10);
+        assertTextsAroundCursor("", null, "");
+
+        deleteSurroundingTextInCodePoints(10, 10);
+        assertTextsAroundCursor("", null, "");
+    }
+
+    @SmallTest
+    @Feature({"TextInput", "Main"})
     public void testSetComposingTextForNewCursorPositions() throws Throwable {
         // Cursor is on the right of composing text when newCursorPosition > 0.
         setComposingText("ab", 1);
         waitAndVerifyUpdateSelection(0, 2, 2, 0, 2);
 
         finishComposingText();
         waitAndVerifyUpdateSelection(1, 2, 2, -1, -1);
 
         // Cursor exceeds the left boundary.
         setComposingText("cdef", -100);
@@ skipping 1068 matching lines @@
 
         deleteSurroundingText(1, 1);
         waitAndVerifyUpdateSelection(2, 1, 1, -1, -1);
         // TODO(yabinh): It should only fire 1 input and 1 selectionchange events.
         waitForEventLogs("keydown(229),input,input,keyup(229),selectionchange,selectionchange,"
                 + "selectionchange,selectionchange");
     }
 
     @MediumTest
     @Feature({"TextInput"})
+    public void testContentEditableEvents_DeleteSurroundingTextInCodePoints() throws Throwable {
+        focusElementAndWaitForStateUpdate("contenteditable_event");
+        waitForEventLogs("selectionchange,selectionchange");
+        clearEventLogs();
+
+        commitText("hello", 1);
+        waitAndVerifyUpdateSelection(0, 5, 5, -1, -1);
+        waitForEventLogs("keydown(229),input,keyup(229),selectionchange");
+        clearEventLogs();
+
+        setSelection(2, 2);
+        waitAndVerifyUpdateSelection(1, 2, 2, -1, -1);
+        waitForEventLogs("selectionchange");
+        clearEventLogs();
+
+        deleteSurroundingTextInCodePoints(1, 1);
+        waitAndVerifyUpdateSelection(2, 1, 1, -1, -1);
+        // TODO(yabinh): It should only fire 1 input and 1 selectionchange events.
+        waitForEventLogs("keydown(229),input,input,keyup(229),selectionchange,selectionchange,"
+                + "selectionchange,selectionchange");
+    }
+
+    @MediumTest
+    @Feature({"TextInput"})
+    public void testInputTextEvents_DeleteSurroundingTextInCodePoints() throws Throwable {
+        commitText("hello", 1);
+        waitAndVerifyUpdateSelection(0, 5, 5, -1, -1);
+        waitForEventLogs("keydown(229),input,keyup(229),selectionchange");
+        clearEventLogs();
+
+        setSelection(2, 2);
+        waitAndVerifyUpdateSelection(1, 2, 2, -1, -1);
+        waitForEventLogs("selectionchange");
+        clearEventLogs();
+
+        deleteSurroundingTextInCodePoints(1, 1);
+        waitAndVerifyUpdateSelection(2, 1, 1, -1, -1);
+        // TODO(yabinh): It should only fire 1 input and 1 selectionchange events.
+        waitForEventLogs("keydown(229),input,input,keyup(229),selectionchange,selectionchange,"
+                + "selectionchange,selectionchange");
+    }
+
+    @MediumTest
+    @Feature({"TextInput"})
     public void testGetCursorCapsMode() throws Throwable {
         focusElementAndWaitForStateUpdate("contenteditable_event");
         commitText("Hello World", 1);
         waitAndVerifyUpdateSelection(0, 11, 11, -1, -1);
         assertEquals(0,
                 getCursorCapsMode(InputType.TYPE_TEXT_FLAG_CAP_WORDS));
         setSelection(6, 6);
         waitAndVerifyUpdateSelection(1, 6, 6, -1, -1);
         assertEquals(InputType.TYPE_TEXT_FLAG_CAP_WORDS,
                 getCursorCapsMode(InputType.TYPE_TEXT_FLAG_CAP_WORDS));
@@ skipping 354 matching lines @@
     private boolean deleteSurroundingText(final int before, final int after) throws Exception {
         final ChromiumBaseInputConnection connection = mConnection;
         return runBlockingOnImeThread(new Callable<Boolean>() {
             @Override
             public Boolean call() {
                 return connection.deleteSurroundingText(before, after);
             }
         });
     }
 
+    // Note that deleteSurroundingTextInCodePoints() was introduced in Android N (Api level 24), but

[aelias_OOO_until_Jul13, 2017/01/04 23:18:13]

As of https://chromium-review.googlesource.com/#/c/376960/ we should be on API
level 24 already, so I'm not sure what problem you ran into here?

[yabinh, 2017/01/05 01:38:50]

There is no deleteSurroundingTextInCodePoints() in InputConnection.java, so I
thought it's not updated to Android N yet.

Also, if we don't add the annotation '@TargetApi(24)', we will get an error when
building content_shell:

'''
ImeTest$36.class Call requires API level 24 (current min is 16):
`android.view.inputmethod.BaseInputConnection#deleteSurroundingTextInCodePoints`:
NewApi [warning]
'''

and a result file saying that:

'''
This check scans through all the Android API calls in the application and warns
about any calls that are not available on *all* versions targeted by this
application (according to its minimum SDK attribute in the manifest).

If you really want to use this API and don't need to support older devices
just set the `minSdkVersion` in your `build.gradle` or `AndroidManifest.xml`
files.

If your code is *deliberately* accessing newer APIs, and you have ensured (e.g.
with conditional execution) that this code will only ever be called on a
supported platform, then you can annotate your class or method with the
`@TargetApi` annotation specifying the local minimum SDK to apply, such as
`@TargetApi(11)`, such that this check considers 11 rather than your manifest
file's minimum SDK as the required API level.
'''

[yabinh, 2017/01/05 02:04:55]

It seems that only 'sdk/build-tools' was updated to level 24, and 'sdk/sources'
is still level 23.

+    // the Android repository used in Chrome is behind that (level 23). So this function can't be
+    // called by keyboard apps currently.
+    @TargetApi(24)
+    private boolean deleteSurroundingTextInCodePoints(final int before, final int after)
+            throws Exception {
+        final ThreadedInputConnection connection = (ThreadedInputConnection) mConnection;
+        return runBlockingOnImeThread(new Callable<Boolean>() {
+            @Override
+            public Boolean call() {
+                return connection.deleteSurroundingTextInCodePoints(before, after);
+            }
+        });
+    }
+
     private CharSequence getTextBeforeCursor(final int length, final int flags) throws Exception {
         final ChromiumBaseInputConnection connection = mConnection;
         return runBlockingOnImeThread(new Callable<CharSequence>() {
             @Override
             public CharSequence call() {
                 return connection.getTextBeforeCursor(length, flags);
             }
         });
     }
 
@@ skipping 118 matching lines @@
         public void onViewAttachedToWindow() {
             mFactory.onViewAttachedToWindow();
         }
 
         @Override
         public void onViewDetachedFromWindow() {
             mFactory.onViewDetachedFromWindow();
         }
     }
 }