diff --git a/api/current.txt b/api/current.txt index b5aae56bc0a7c..2c58ab1d223b6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44715,6 +44715,7 @@ package android.view.inputmethod { method public boolean clearMetaKeyStates(int); method public void closeConnection(); method public boolean commitCompletion(android.view.inputmethod.CompletionInfo); + method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo); method public boolean commitText(java.lang.CharSequence, int); method public boolean deleteSurroundingText(int, int); @@ -44730,7 +44731,6 @@ package android.view.inputmethod { method public java.lang.CharSequence getSelectedText(int); method public java.lang.CharSequence getTextAfterCursor(int, int); method public java.lang.CharSequence getTextBeforeCursor(int, int); - method public boolean insertContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public boolean performContextMenuAction(int); method public boolean performEditorAction(int); method public boolean performPrivateCommand(java.lang.String, android.os.Bundle); @@ -44885,6 +44885,7 @@ package android.view.inputmethod { method public abstract boolean clearMetaKeyStates(int); method public abstract void closeConnection(); method public abstract boolean commitCompletion(android.view.inputmethod.CompletionInfo); + method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public abstract boolean commitCorrection(android.view.inputmethod.CorrectionInfo); method public abstract boolean commitText(java.lang.CharSequence, int); method public abstract boolean deleteSurroundingText(int, int); @@ -44897,7 +44898,6 @@ package android.view.inputmethod { method public abstract java.lang.CharSequence getSelectedText(int); method public abstract java.lang.CharSequence getTextAfterCursor(int, int); method public abstract java.lang.CharSequence getTextBeforeCursor(int, int); - method public abstract boolean insertContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public abstract boolean performContextMenuAction(int); method public abstract boolean performEditorAction(int); method public abstract boolean performPrivateCommand(java.lang.String, android.os.Bundle); @@ -44919,6 +44919,7 @@ package android.view.inputmethod { method public boolean clearMetaKeyStates(int); method public void closeConnection(); method public boolean commitCompletion(android.view.inputmethod.CompletionInfo); + method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo); method public boolean commitText(java.lang.CharSequence, int); method public boolean deleteSurroundingText(int, int); @@ -44931,7 +44932,6 @@ package android.view.inputmethod { method public java.lang.CharSequence getSelectedText(int); method public java.lang.CharSequence getTextAfterCursor(int, int); method public java.lang.CharSequence getTextBeforeCursor(int, int); - method public boolean insertContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public boolean performContextMenuAction(int); method public boolean performEditorAction(int); method public boolean performPrivateCommand(java.lang.String, android.os.Bundle); diff --git a/api/system-current.txt b/api/system-current.txt index 554f224a26199..a1b058920b12a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -47822,6 +47822,7 @@ package android.view.inputmethod { method public boolean clearMetaKeyStates(int); method public void closeConnection(); method public boolean commitCompletion(android.view.inputmethod.CompletionInfo); + method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo); method public boolean commitText(java.lang.CharSequence, int); method public boolean deleteSurroundingText(int, int); @@ -47837,7 +47838,6 @@ package android.view.inputmethod { method public java.lang.CharSequence getSelectedText(int); method public java.lang.CharSequence getTextAfterCursor(int, int); method public java.lang.CharSequence getTextBeforeCursor(int, int); - method public boolean insertContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public boolean performContextMenuAction(int); method public boolean performEditorAction(int); method public boolean performPrivateCommand(java.lang.String, android.os.Bundle); @@ -47992,6 +47992,7 @@ package android.view.inputmethod { method public abstract boolean clearMetaKeyStates(int); method public abstract void closeConnection(); method public abstract boolean commitCompletion(android.view.inputmethod.CompletionInfo); + method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public abstract boolean commitCorrection(android.view.inputmethod.CorrectionInfo); method public abstract boolean commitText(java.lang.CharSequence, int); method public abstract boolean deleteSurroundingText(int, int); @@ -48004,7 +48005,6 @@ package android.view.inputmethod { method public abstract java.lang.CharSequence getSelectedText(int); method public abstract java.lang.CharSequence getTextAfterCursor(int, int); method public abstract java.lang.CharSequence getTextBeforeCursor(int, int); - method public abstract boolean insertContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public abstract boolean performContextMenuAction(int); method public abstract boolean performEditorAction(int); method public abstract boolean performPrivateCommand(java.lang.String, android.os.Bundle); @@ -48026,6 +48026,7 @@ package android.view.inputmethod { method public boolean clearMetaKeyStates(int); method public void closeConnection(); method public boolean commitCompletion(android.view.inputmethod.CompletionInfo); + method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo); method public boolean commitText(java.lang.CharSequence, int); method public boolean deleteSurroundingText(int, int); @@ -48038,7 +48039,6 @@ package android.view.inputmethod { method public java.lang.CharSequence getSelectedText(int); method public java.lang.CharSequence getTextAfterCursor(int, int); method public java.lang.CharSequence getTextBeforeCursor(int, int); - method public boolean insertContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public boolean performContextMenuAction(int); method public boolean performEditorAction(int); method public boolean performPrivateCommand(java.lang.String, android.os.Bundle); diff --git a/api/test-current.txt b/api/test-current.txt index ac6e8262c9b8b..75310317023e1 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -44795,6 +44795,7 @@ package android.view.inputmethod { method public boolean clearMetaKeyStates(int); method public void closeConnection(); method public boolean commitCompletion(android.view.inputmethod.CompletionInfo); + method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo); method public boolean commitText(java.lang.CharSequence, int); method public boolean deleteSurroundingText(int, int); @@ -44810,7 +44811,6 @@ package android.view.inputmethod { method public java.lang.CharSequence getSelectedText(int); method public java.lang.CharSequence getTextAfterCursor(int, int); method public java.lang.CharSequence getTextBeforeCursor(int, int); - method public boolean insertContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public boolean performContextMenuAction(int); method public boolean performEditorAction(int); method public boolean performPrivateCommand(java.lang.String, android.os.Bundle); @@ -44965,6 +44965,7 @@ package android.view.inputmethod { method public abstract boolean clearMetaKeyStates(int); method public abstract void closeConnection(); method public abstract boolean commitCompletion(android.view.inputmethod.CompletionInfo); + method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public abstract boolean commitCorrection(android.view.inputmethod.CorrectionInfo); method public abstract boolean commitText(java.lang.CharSequence, int); method public abstract boolean deleteSurroundingText(int, int); @@ -44977,7 +44978,6 @@ package android.view.inputmethod { method public abstract java.lang.CharSequence getSelectedText(int); method public abstract java.lang.CharSequence getTextAfterCursor(int, int); method public abstract java.lang.CharSequence getTextBeforeCursor(int, int); - method public abstract boolean insertContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public abstract boolean performContextMenuAction(int); method public abstract boolean performEditorAction(int); method public abstract boolean performPrivateCommand(java.lang.String, android.os.Bundle); @@ -44999,6 +44999,7 @@ package android.view.inputmethod { method public boolean clearMetaKeyStates(int); method public void closeConnection(); method public boolean commitCompletion(android.view.inputmethod.CompletionInfo); + method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo); method public boolean commitText(java.lang.CharSequence, int); method public boolean deleteSurroundingText(int, int); @@ -45011,7 +45012,6 @@ package android.view.inputmethod { method public java.lang.CharSequence getSelectedText(int); method public java.lang.CharSequence getTextAfterCursor(int, int); method public java.lang.CharSequence getTextBeforeCursor(int, int); - method public boolean insertContent(android.view.inputmethod.InputContentInfo, android.os.Bundle); method public boolean performContextMenuAction(int); method public boolean performEditorAction(int); method public boolean performPrivateCommand(java.lang.String, android.os.Bundle); diff --git a/core/java/android/view/inputmethod/BaseInputConnection.java b/core/java/android/view/inputmethod/BaseInputConnection.java index 7c3fc8b5808bd..0ebbf7fde4876 100644 --- a/core/java/android/view/inputmethod/BaseInputConnection.java +++ b/core/java/android/view/inputmethod/BaseInputConnection.java @@ -855,5 +855,5 @@ public class BaseInputConnection implements InputConnection { /** * The default implementation does nothing. */ - public boolean insertContent(InputContentInfo inputContentInfo, Bundle opts) { return false; } + public boolean commitContent(InputContentInfo inputContentInfo, Bundle opts) { return false; } } diff --git a/core/java/android/view/inputmethod/EditorInfo.java b/core/java/android/view/inputmethod/EditorInfo.java index 7ed0d27f65ece..2dca892a81036 100644 --- a/core/java/android/view/inputmethod/EditorInfo.java +++ b/core/java/android/view/inputmethod/EditorInfo.java @@ -368,10 +368,10 @@ public class EditorInfo implements InputType, Parcelable { /** * List of acceptable MIME types for - * {@link InputConnection#insertContent(InputContentInfo, Bundle)}. + * {@link InputConnection#commitContent(InputContentInfo, Bundle)}. * *

{@code null} or an empty array means that - * {@link InputConnection#insertContent(InputContentInfo, Bundle)} is not supported in this + * {@link InputConnection#commitContent(InputContentInfo, Bundle)} is not supported in this * editor.

*/ @Nullable diff --git a/core/java/android/view/inputmethod/InputConnection.java b/core/java/android/view/inputmethod/InputConnection.java index 05e05699df944..f7f369445d470 100644 --- a/core/java/android/view/inputmethod/InputConnection.java +++ b/core/java/android/view/inputmethod/InputConnection.java @@ -840,7 +840,7 @@ public interface InputConnection { public void closeConnection(); /** - * Called by the input method to insert a content such as PNG image to the editor. + * Called by the input method to commit a content such as PNG image to the editor. * *

In order to avoid variety of compatibility issues, this focuses on a simple use case, * where we expect editors and IMEs work cooperatively as follows:

@@ -866,5 +866,5 @@ public interface InputConnection { * @return {@code true} if this request is accepted by the application, no matter if the request * is already handled or still being handled in background. */ - public boolean insertContent(@NonNull InputContentInfo inputContentInfo, @Nullable Bundle opts); + public boolean commitContent(@NonNull InputContentInfo inputContentInfo, @Nullable Bundle opts); } diff --git a/core/java/android/view/inputmethod/InputConnectionInspector.java b/core/java/android/view/inputmethod/InputConnectionInspector.java index fb24fcd8c77a2..727e9ca1e1700 100644 --- a/core/java/android/view/inputmethod/InputConnectionInspector.java +++ b/core/java/android/view/inputmethod/InputConnectionInspector.java @@ -43,7 +43,7 @@ public final class InputConnectionInspector { MissingMethodFlags.DELETE_SURROUNDING_TEXT_IN_CODE_POINTS, MissingMethodFlags.GET_HANDLER, MissingMethodFlags.CLOSE_CONNECTION, - MissingMethodFlags.INSERT_CONTENT, + MissingMethodFlags.COMMIT_CONTENT, }) public @interface MissingMethodFlags { /** @@ -82,10 +82,10 @@ public final class InputConnectionInspector { */ int CLOSE_CONNECTION = 1 << 6; /** - * {@link InputConnection#insertContent(InputContentInfo, Bundle)} is available in + * {@link InputConnection#commitContent(InputContentInfo, Bundle)} is available in * {@link android.os.Build.VERSION_CODES#N} MR-1 and later. */ - int INSERT_CONTENT = 1 << 7; + int COMMIT_CONTENT = 1 << 7; } private static final Map sMissingMethodsMap = Collections.synchronizedMap( @@ -135,8 +135,8 @@ public final class InputConnectionInspector { if (!hasCloseConnection(clazz)) { flags |= MissingMethodFlags.CLOSE_CONNECTION; } - if (!hasInsertContent(clazz)) { - flags |= MissingMethodFlags.INSERT_CONTENT; + if (!hasCommitContent(clazz)) { + flags |= MissingMethodFlags.COMMIT_CONTENT; } sMissingMethodsMap.put(clazz, flags); return flags; @@ -206,9 +206,9 @@ public final class InputConnectionInspector { } } - private static boolean hasInsertContent(@NonNull final Class clazz) { + private static boolean hasCommitContent(@NonNull final Class clazz) { try { - final Method method = clazz.getMethod("insertContent", InputContentInfo.class, + final Method method = clazz.getMethod("commitContent", InputContentInfo.class, Bundle.class); return !Modifier.isAbstract(method.getModifiers()); } catch (NoSuchMethodException e) { @@ -263,11 +263,11 @@ public final class InputConnectionInspector { } sb.append("closeConnection()"); } - if ((flags & MissingMethodFlags.INSERT_CONTENT) != 0) { + if ((flags & MissingMethodFlags.COMMIT_CONTENT) != 0) { if (!isEmpty) { sb.append(","); } - sb.append("InsertContent(InputContentInfo, Bundle)"); + sb.append("commitContent(InputContentInfo, Bundle)"); } return sb.toString(); } diff --git a/core/java/android/view/inputmethod/InputConnectionWrapper.java b/core/java/android/view/inputmethod/InputConnectionWrapper.java index 431836a44f84d..af9bcae23ffe3 100644 --- a/core/java/android/view/inputmethod/InputConnectionWrapper.java +++ b/core/java/android/view/inputmethod/InputConnectionWrapper.java @@ -274,7 +274,7 @@ public class InputConnectionWrapper implements InputConnection { * {@inheritDoc} * @throws NullPointerException if the target is {@code null}. */ - public boolean insertContent(InputContentInfo inputContentInfo, Bundle opts) { - return mTarget.insertContent(inputContentInfo, opts); + public boolean commitContent(InputContentInfo inputContentInfo, Bundle opts) { + return mTarget.commitContent(inputContentInfo, opts); } } diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index fb532e2dd17f2..f2964218127bc 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -19,7 +19,6 @@ package android.widget; import android.annotation.ColorInt; import android.annotation.DrawableRes; import android.annotation.NonNull; -import android.content.ClipData; import android.content.Context; import android.content.Intent; import android.content.res.TypedArray; @@ -5986,8 +5985,8 @@ public abstract class AbsListView extends AdapterView implements Te } @Override - public boolean insertContent(InputContentInfo inputContentInfo, Bundle opts) { - return getTarget().insertContent(inputContentInfo, opts); + public boolean commitContent(InputContentInfo inputContentInfo, Bundle opts) { + return getTarget().commitContent(inputContentInfo, opts); } } diff --git a/core/java/com/android/internal/view/IInputConnectionWrapper.java b/core/java/com/android/internal/view/IInputConnectionWrapper.java index fc189a3e909e6..dce9d2cc55808 100644 --- a/core/java/com/android/internal/view/IInputConnectionWrapper.java +++ b/core/java/com/android/internal/view/IInputConnectionWrapper.java @@ -62,7 +62,7 @@ public abstract class IInputConnectionWrapper extends IInputContext.Stub { private static final int DO_CLEAR_META_KEY_STATES = 130; private static final int DO_REQUEST_UPDATE_CURSOR_ANCHOR_INFO = 140; private static final int DO_CLOSE_CONNECTION = 150; - private static final int DO_INSERT_CONTENT = 160; + private static final int DO_COMMIT_CONTENT = 160; @GuardedBy("mLock") @Nullable @@ -243,9 +243,9 @@ public abstract class IInputConnectionWrapper extends IInputContext.Stub { dispatchMessage(obtainMessage(DO_CLOSE_CONNECTION)); } - public void insertContent(InputContentInfo inputContentInfo, Bundle opts, + public void commitContent(InputContentInfo inputContentInfo, Bundle opts, int seq, IInputContextCallback callback) { - dispatchMessage(obtainMessageOOSC(DO_INSERT_CONTENT, inputContentInfo, opts, seq, callback)); + dispatchMessage(obtainMessageOOSC(DO_COMMIT_CONTENT, inputContentInfo, opts, seq, callback)); } void dispatchMessage(Message msg) { @@ -559,26 +559,26 @@ public abstract class IInputConnectionWrapper extends IInputContext.Stub { } return; } - case DO_INSERT_CONTENT: { + case DO_COMMIT_CONTENT: { SomeArgs args = (SomeArgs) msg.obj; try { InputConnection ic = getInputConnection(); if (ic == null || !isActive()) { - Log.w(TAG, "insertContent on inactive InputConnection"); - args.callback.setInsertContentResult(false, args.seq); + Log.w(TAG, "commitContent on inactive InputConnection"); + args.callback.setCommitContentResult(false, args.seq); return; } final InputContentInfo inputContentInfo = (InputContentInfo) args.arg1; if (inputContentInfo == null || !inputContentInfo.validate()) { - Log.w(TAG, "insertContent with invalid inputContentInfo=" + Log.w(TAG, "commitContent with invalid inputContentInfo=" + inputContentInfo); - args.callback.setInsertContentResult(false, args.seq); + args.callback.setCommitContentResult(false, args.seq); return; } - args.callback.setInsertContentResult( - ic.insertContent(inputContentInfo, (Bundle) args.arg2), args.seq); + args.callback.setCommitContentResult( + ic.commitContent(inputContentInfo, (Bundle) args.arg2), args.seq); } catch (RemoteException e) { - Log.w(TAG, "Got RemoteException calling insertContent", e); + Log.w(TAG, "Got RemoteException calling commitContent", e); } return; } diff --git a/core/java/com/android/internal/view/IInputContext.aidl b/core/java/com/android/internal/view/IInputContext.aidl index bd473557a1b61..0d5c8a127e6b7 100644 --- a/core/java/com/android/internal/view/IInputContext.aidl +++ b/core/java/com/android/internal/view/IInputContext.aidl @@ -78,6 +78,6 @@ import com.android.internal.view.IInputContextCallback; void requestUpdateCursorAnchorInfo(int cursorUpdateMode, int seq, IInputContextCallback callback); - void insertContent(in InputContentInfo inputContentInfo, in Bundle opts, int sec, + void commitContent(in InputContentInfo inputContentInfo, in Bundle opts, int sec, IInputContextCallback callback); } diff --git a/core/java/com/android/internal/view/IInputContextCallback.aidl b/core/java/com/android/internal/view/IInputContextCallback.aidl index 933cdc0d87453..0f40a83d7ee4b 100644 --- a/core/java/com/android/internal/view/IInputContextCallback.aidl +++ b/core/java/com/android/internal/view/IInputContextCallback.aidl @@ -28,5 +28,5 @@ oneway interface IInputContextCallback { void setExtractedText(in ExtractedText extractedText, int seq); void setSelectedText(CharSequence selectedText, int seq); void setRequestUpdateCursorAnchorInfoResult(boolean result, int seq); - void setInsertContentResult(boolean result, int seq); + void setCommitContentResult(boolean result, int seq); } diff --git a/core/java/com/android/internal/view/InputConnectionWrapper.java b/core/java/com/android/internal/view/InputConnectionWrapper.java index 6d4d45c7041f1..5e78ec5e98330 100644 --- a/core/java/com/android/internal/view/InputConnectionWrapper.java +++ b/core/java/com/android/internal/view/InputConnectionWrapper.java @@ -16,7 +16,6 @@ package com.android.internal.view; -import android.content.ClipData; import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; @@ -48,7 +47,7 @@ public class InputConnectionWrapper implements InputConnection { public ExtractedText mExtractedText; public int mCursorCapsMode; public boolean mRequestUpdateCursorAnchorInfoResult; - public boolean mInsertContentResult; + public boolean mCommitContentResult; // A 'pool' of one InputContextCallback. Each ICW request will attempt to gain // exclusive access to this object. @@ -175,15 +174,15 @@ public class InputConnectionWrapper implements InputConnection { } } - public void setInsertContentResult(boolean result, int seq) { + public void setCommitContentResult(boolean result, int seq) { synchronized (this) { if (seq == mSeq) { - mInsertContentResult = result; + mCommitContentResult = result; mHaveValue = true; notifyAll(); } else { Log.i(TAG, "Got out-of-sequence callback " + seq + " (expected " + mSeq - + ") in setInsertContentResult, ignoring."); + + ") in setCommitContentResult, ignoring."); } } } @@ -507,19 +506,19 @@ public class InputConnectionWrapper implements InputConnection { // Nothing should happen when called from input method. } - public boolean insertContent(InputContentInfo inputContentInfo, Bundle opts) { + public boolean commitContent(InputContentInfo inputContentInfo, Bundle opts) { boolean result = false; - if (isMethodMissing(MissingMethodFlags.INSERT_CONTENT)) { + if (isMethodMissing(MissingMethodFlags.COMMIT_CONTENT)) { // This method is not implemented. return false; } try { InputContextCallback callback = InputContextCallback.getInstance(); - mIInputContext.insertContent(inputContentInfo, opts, callback.mSeq, callback); + mIInputContext.commitContent(inputContentInfo, opts, callback.mSeq, callback); synchronized (callback) { callback.waitForResultLocked(); if (callback.mHaveValue) { - result = callback.mInsertContentResult; + result = callback.mCommitContentResult; } } callback.dispose();