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

Commit adebb525 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

API Rename: IC#inputContent to IC#commitContent. 

As shown in below, we have already used commit* naming convention in
InputConnection.

 - InputConnection#commitCompletion(CompletionInfo);
 - InputConnection#commitCorrection(CorrectionInfo);
 - InputConnection#commitText(CharSequence, int);

Hence renaming IC#inputContent() to IC#commitContent() would make the
new method more consistent.

Bug: 29450024
Change-Id: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
parent 4e5ee653

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -44696,6 +44696,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);
@@ -44711,7 +44712,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);
@@ -44866,6 +44866,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);
@@ -44878,7 +44879,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);
@@ -44900,6 +44900,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);
@@ -44912,7 +44913,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
@@ -47803,6 +47803,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);
@@ -47818,7 +47819,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);
@@ -47973,6 +47973,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);
@@ -47985,7 +47986,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);
@@ -48007,6 +48007,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);
@@ -48019,7 +48020,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
@@ -44776,6 +44776,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);
@@ -44791,7 +44792,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);
@@ -44946,6 +44946,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);
@@ -44958,7 +44959,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);
@@ -44980,6 +44980,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);
@@ -44992,7 +44993,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