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

Commit 647f163c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update javadoc for EditorInfo.actionId usage"

parents 6e6b476a e48180fb

core/java/android/inputmethodservice/InputMethodService.java

+6 −1
Original line number Diff line number Diff line
@@ -2868,6 +2868,11 @@ public class InputMethodService extends AbstractInputMethodService { 
     * {@link InputConnection#performEditorAction

     * InputConnection.performEditorAction()}.

     *

     * <p>For compatibility, this method does not execute a custom action even if {@link

     * EditorInfo#actionLabel EditorInfo.actionLabel} is set. The implementor should directly call

     * {@link InputConnection#performEditorAction InputConnection.performEditorAction()} with

     * {@link EditorInfo#actionId EditorInfo.actionId} if they want to execute a custom action.</p>

     *

     * @param fromEnterKey If true, this will be executed as if the user had

     * pressed an enter key on the keyboard, that is it will <em>not</em>

     * be done if the editor has set {@link EditorInfo#IME_FLAG_NO_ENTER_ACTION

core/java/android/view/inputmethod/InputConnection.java

+3 −2
Original line number Diff line number Diff line
@@ -726,8 +726,9 @@ public interface InputConnection { 
     * associated with the action.</p>

     *

     * @param editorAction This must be one of the action constants for

     * {@link EditorInfo#imeOptions EditorInfo.editorType}, such as

     * {@link EditorInfo#IME_ACTION_GO EditorInfo.EDITOR_ACTION_GO}.

     * {@link EditorInfo#imeOptions EditorInfo.imeOptions}, such as

     * {@link EditorInfo#IME_ACTION_GO EditorInfo.EDITOR_ACTION_GO}, or the value of

     * {@link EditorInfo#actionId EditorInfo.actionId} if a custom action is available.

     * @return true on success, false if the input connection is no longer

     * valid.

     */