Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01e7c10d authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge "API Rename: IC#inputContent to IC#commitContent." into nyc-mr1-dev

parents a65d8b66 adebb525

api/current.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -44692,6 +44692,7 @@ package android.view.inputmethod { 
    method public boolean clearMetaKeyStates(int);

    method public boolean clearMetaKeyStates(int);

    method public void closeConnection();

    method public void closeConnection();

    method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);

    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 commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public boolean commitText(java.lang.CharSequence, int);

    method public boolean commitText(java.lang.CharSequence, int);

    method public boolean deleteSurroundingText(int, int);

    method public boolean deleteSurroundingText(int, int);
@@ -44707,7 +44708,6 @@ package android.view.inputmethod { 
    method public java.lang.CharSequence getSelectedText(int);

    method public java.lang.CharSequence getSelectedText(int);

    method public java.lang.CharSequence getTextAfterCursor(int, int);

    method public java.lang.CharSequence getTextAfterCursor(int, int);

    method public java.lang.CharSequence getTextBeforeCursor(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 performContextMenuAction(int);

    method public boolean performEditorAction(int);

    method public boolean performEditorAction(int);

    method public boolean performPrivateCommand(java.lang.String, android.os.Bundle);

    method public boolean performPrivateCommand(java.lang.String, android.os.Bundle);
@@ -44862,6 +44862,7 @@ package android.view.inputmethod { 
    method public abstract boolean clearMetaKeyStates(int);

    method public abstract boolean clearMetaKeyStates(int);

    method public abstract void closeConnection();

    method public abstract void closeConnection();

    method public abstract boolean commitCompletion(android.view.inputmethod.CompletionInfo);

    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 commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public abstract boolean commitText(java.lang.CharSequence, int);

    method public abstract boolean commitText(java.lang.CharSequence, int);

    method public abstract boolean deleteSurroundingText(int, int);

    method public abstract boolean deleteSurroundingText(int, int);
@@ -44874,7 +44875,6 @@ package android.view.inputmethod { 
    method public abstract java.lang.CharSequence getSelectedText(int);

    method public abstract java.lang.CharSequence getSelectedText(int);

    method public abstract java.lang.CharSequence getTextAfterCursor(int, int);

    method public abstract java.lang.CharSequence getTextAfterCursor(int, int);

    method public abstract java.lang.CharSequence getTextBeforeCursor(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 performContextMenuAction(int);

    method public abstract boolean performEditorAction(int);

    method public abstract boolean performEditorAction(int);

    method public abstract boolean performPrivateCommand(java.lang.String, android.os.Bundle);

    method public abstract boolean performPrivateCommand(java.lang.String, android.os.Bundle);
@@ -44896,6 +44896,7 @@ package android.view.inputmethod { 
    method public boolean clearMetaKeyStates(int);

    method public boolean clearMetaKeyStates(int);

    method public void closeConnection();

    method public void closeConnection();

    method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);

    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 commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public boolean commitText(java.lang.CharSequence, int);

    method public boolean commitText(java.lang.CharSequence, int);

    method public boolean deleteSurroundingText(int, int);

    method public boolean deleteSurroundingText(int, int);
@@ -44908,7 +44909,6 @@ package android.view.inputmethod { 
    method public java.lang.CharSequence getSelectedText(int);

    method public java.lang.CharSequence getSelectedText(int);

    method public java.lang.CharSequence getTextAfterCursor(int, int);

    method public java.lang.CharSequence getTextAfterCursor(int, int);

    method public java.lang.CharSequence getTextBeforeCursor(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 performContextMenuAction(int);

    method public boolean performEditorAction(int);

    method public boolean performEditorAction(int);

    method public boolean performPrivateCommand(java.lang.String, android.os.Bundle);

    method public boolean performPrivateCommand(java.lang.String, android.os.Bundle);

api/system-current.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -47799,6 +47799,7 @@ package android.view.inputmethod { 
    method public boolean clearMetaKeyStates(int);

    method public boolean clearMetaKeyStates(int);

    method public void closeConnection();

    method public void closeConnection();

    method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);

    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 commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public boolean commitText(java.lang.CharSequence, int);

    method public boolean commitText(java.lang.CharSequence, int);

    method public boolean deleteSurroundingText(int, int);

    method public boolean deleteSurroundingText(int, int);
@@ -47814,7 +47815,6 @@ package android.view.inputmethod { 
    method public java.lang.CharSequence getSelectedText(int);

    method public java.lang.CharSequence getSelectedText(int);

    method public java.lang.CharSequence getTextAfterCursor(int, int);

    method public java.lang.CharSequence getTextAfterCursor(int, int);

    method public java.lang.CharSequence getTextBeforeCursor(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 performContextMenuAction(int);

    method public boolean performEditorAction(int);

    method public boolean performEditorAction(int);

    method public boolean performPrivateCommand(java.lang.String, android.os.Bundle);

    method public boolean performPrivateCommand(java.lang.String, android.os.Bundle);
@@ -47969,6 +47969,7 @@ package android.view.inputmethod { 
    method public abstract boolean clearMetaKeyStates(int);

    method public abstract boolean clearMetaKeyStates(int);

    method public abstract void closeConnection();

    method public abstract void closeConnection();

    method public abstract boolean commitCompletion(android.view.inputmethod.CompletionInfo);

    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 commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public abstract boolean commitText(java.lang.CharSequence, int);

    method public abstract boolean commitText(java.lang.CharSequence, int);

    method public abstract boolean deleteSurroundingText(int, int);

    method public abstract boolean deleteSurroundingText(int, int);
@@ -47981,7 +47982,6 @@ package android.view.inputmethod { 
    method public abstract java.lang.CharSequence getSelectedText(int);

    method public abstract java.lang.CharSequence getSelectedText(int);

    method public abstract java.lang.CharSequence getTextAfterCursor(int, int);

    method public abstract java.lang.CharSequence getTextAfterCursor(int, int);

    method public abstract java.lang.CharSequence getTextBeforeCursor(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 performContextMenuAction(int);

    method public abstract boolean performEditorAction(int);

    method public abstract boolean performEditorAction(int);

    method public abstract boolean performPrivateCommand(java.lang.String, android.os.Bundle);

    method public abstract boolean performPrivateCommand(java.lang.String, android.os.Bundle);
@@ -48003,6 +48003,7 @@ package android.view.inputmethod { 
    method public boolean clearMetaKeyStates(int);

    method public boolean clearMetaKeyStates(int);

    method public void closeConnection();

    method public void closeConnection();

    method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);

    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 commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public boolean commitText(java.lang.CharSequence, int);

    method public boolean commitText(java.lang.CharSequence, int);

    method public boolean deleteSurroundingText(int, int);

    method public boolean deleteSurroundingText(int, int);
@@ -48015,7 +48016,6 @@ package android.view.inputmethod { 
    method public java.lang.CharSequence getSelectedText(int);

    method public java.lang.CharSequence getSelectedText(int);

    method public java.lang.CharSequence getTextAfterCursor(int, int);

    method public java.lang.CharSequence getTextAfterCursor(int, int);

    method public java.lang.CharSequence getTextBeforeCursor(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 performContextMenuAction(int);

    method public boolean performEditorAction(int);

    method public boolean performEditorAction(int);

    method public boolean performPrivateCommand(java.lang.String, android.os.Bundle);

    method public boolean performPrivateCommand(java.lang.String, android.os.Bundle);

api/test-current.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -44772,6 +44772,7 @@ package android.view.inputmethod { 
    method public boolean clearMetaKeyStates(int);

    method public boolean clearMetaKeyStates(int);

    method public void closeConnection();

    method public void closeConnection();

    method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);

    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 commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public boolean commitText(java.lang.CharSequence, int);

    method public boolean commitText(java.lang.CharSequence, int);

    method public boolean deleteSurroundingText(int, int);

    method public boolean deleteSurroundingText(int, int);
@@ -44787,7 +44788,6 @@ package android.view.inputmethod { 
    method public java.lang.CharSequence getSelectedText(int);

    method public java.lang.CharSequence getSelectedText(int);

    method public java.lang.CharSequence getTextAfterCursor(int, int);

    method public java.lang.CharSequence getTextAfterCursor(int, int);

    method public java.lang.CharSequence getTextBeforeCursor(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 performContextMenuAction(int);

    method public boolean performEditorAction(int);

    method public boolean performEditorAction(int);

    method public boolean performPrivateCommand(java.lang.String, android.os.Bundle);

    method public boolean performPrivateCommand(java.lang.String, android.os.Bundle);
@@ -44942,6 +44942,7 @@ package android.view.inputmethod { 
    method public abstract boolean clearMetaKeyStates(int);

    method public abstract boolean clearMetaKeyStates(int);

    method public abstract void closeConnection();

    method public abstract void closeConnection();

    method public abstract boolean commitCompletion(android.view.inputmethod.CompletionInfo);

    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 commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public abstract boolean commitText(java.lang.CharSequence, int);

    method public abstract boolean commitText(java.lang.CharSequence, int);

    method public abstract boolean deleteSurroundingText(int, int);

    method public abstract boolean deleteSurroundingText(int, int);
@@ -44954,7 +44955,6 @@ package android.view.inputmethod { 
    method public abstract java.lang.CharSequence getSelectedText(int);

    method public abstract java.lang.CharSequence getSelectedText(int);

    method public abstract java.lang.CharSequence getTextAfterCursor(int, int);

    method public abstract java.lang.CharSequence getTextAfterCursor(int, int);

    method public abstract java.lang.CharSequence getTextBeforeCursor(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 performContextMenuAction(int);

    method public abstract boolean performEditorAction(int);

    method public abstract boolean performEditorAction(int);

    method public abstract boolean performPrivateCommand(java.lang.String, android.os.Bundle);

    method public abstract boolean performPrivateCommand(java.lang.String, android.os.Bundle);
@@ -44976,6 +44976,7 @@ package android.view.inputmethod { 
    method public boolean clearMetaKeyStates(int);

    method public boolean clearMetaKeyStates(int);

    method public void closeConnection();

    method public void closeConnection();

    method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);

    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 commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public boolean commitText(java.lang.CharSequence, int);

    method public boolean commitText(java.lang.CharSequence, int);

    method public boolean deleteSurroundingText(int, int);

    method public boolean deleteSurroundingText(int, int);
@@ -44988,7 +44989,6 @@ package android.view.inputmethod { 
    method public java.lang.CharSequence getSelectedText(int);

    method public java.lang.CharSequence getSelectedText(int);

    method public java.lang.CharSequence getTextAfterCursor(int, int);

    method public java.lang.CharSequence getTextAfterCursor(int, int);

    method public java.lang.CharSequence getTextBeforeCursor(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 performContextMenuAction(int);

    method public boolean performEditorAction(int);

    method public boolean performEditorAction(int);

    method public boolean performPrivateCommand(java.lang.String, android.os.Bundle);

    method public boolean performPrivateCommand(java.lang.String, android.os.Bundle);

core/java/android/view/inputmethod/BaseInputConnection.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -855,5 +855,5 @@ public class BaseInputConnection implements InputConnection { 
    /**

    /**

     * The default implementation does nothing.

     * The default implementation does nothing.

     */

     */

    public boolean insertContent(InputContentInfo inputContentInfo, Bundle opts) { return false; }

    public boolean commitContent(InputContentInfo inputContentInfo, Bundle opts) { return false; }

}
 
}

core/java/android/view/inputmethod/EditorInfo.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -368,10 +368,10 @@ public class EditorInfo implements InputType, Parcelable { 




    /**

    /**

     * List of acceptable MIME types for

     * List of acceptable MIME types for

     * {@link InputConnection#insertContent(InputContentInfo, Bundle)}.

     * {@link InputConnection#commitContent(InputContentInfo, Bundle)}.

     *

     *

     * <p>{@code null} or an empty array means that

     * <p>{@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.</p>

     * editor.</p>

     */

     */

    @Nullable

    @Nullable