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

Commit 045de3f0 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by android-build-merger
Browse files

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

am: 0d7dcf7b

Change-Id: I5c4209a79e7426192da082100ac2a7517de36b81
parents e609f443 0d7dcf7b

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -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);

api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -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);

api/test-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -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);

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

+1 −1
Original line number Diff line number Diff line
@@ -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; }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -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)}.

     *

     * <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>

     */

    @Nullable