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

Commit 06ac7454 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by android-build-merger
Browse files

Merge "Add IC#closeConnection()." into nyc-dev am: f6f0f5fb 

am: 9f42270f

* commit '9f42270f':
  Add IC#closeConnection().

Change-Id: I3fca2eb604a485b904099730d317035130b3afbb
parents eca4c79d 9f42270f

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -44653,6 +44653,7 @@ package android.view.inputmethod { 
    ctor public BaseInputConnection(android.view.View, boolean);

    method public boolean beginBatchEdit();

    method public boolean clearMetaKeyStates(int);

    method public void closeConnection();

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

    method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public boolean commitText(java.lang.CharSequence, int);
@@ -44820,6 +44821,7 @@ package android.view.inputmethod { 
  public abstract interface InputConnection {

    method public abstract boolean beginBatchEdit();

    method public abstract boolean clearMetaKeyStates(int);

    method public abstract void closeConnection();

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

    method public abstract boolean commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public abstract boolean commitText(java.lang.CharSequence, int);
@@ -44852,6 +44854,7 @@ package android.view.inputmethod { 
    ctor public InputConnectionWrapper(android.view.inputmethod.InputConnection, boolean);

    method public boolean beginBatchEdit();

    method public boolean clearMetaKeyStates(int);

    method public void closeConnection();

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

    method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);

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

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -47384,6 +47384,7 @@ package android.view.inputmethod { 
    ctor public BaseInputConnection(android.view.View, boolean);

    method public boolean beginBatchEdit();

    method public boolean clearMetaKeyStates(int);

    method public void closeConnection();

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

    method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public boolean commitText(java.lang.CharSequence, int);
@@ -47551,6 +47552,7 @@ package android.view.inputmethod { 
  public abstract interface InputConnection {

    method public abstract boolean beginBatchEdit();

    method public abstract boolean clearMetaKeyStates(int);

    method public abstract void closeConnection();

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

    method public abstract boolean commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public abstract boolean commitText(java.lang.CharSequence, int);
@@ -47583,6 +47585,7 @@ package android.view.inputmethod { 
    ctor public InputConnectionWrapper(android.view.inputmethod.InputConnection, boolean);

    method public boolean beginBatchEdit();

    method public boolean clearMetaKeyStates(int);

    method public void closeConnection();

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

    method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);

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

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -44727,6 +44727,7 @@ package android.view.inputmethod { 
    ctor public BaseInputConnection(android.view.View, boolean);

    method public boolean beginBatchEdit();

    method public boolean clearMetaKeyStates(int);

    method public void closeConnection();

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

    method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public boolean commitText(java.lang.CharSequence, int);
@@ -44894,6 +44895,7 @@ package android.view.inputmethod { 
  public abstract interface InputConnection {

    method public abstract boolean beginBatchEdit();

    method public abstract boolean clearMetaKeyStates(int);

    method public abstract void closeConnection();

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

    method public abstract boolean commitCorrection(android.view.inputmethod.CorrectionInfo);

    method public abstract boolean commitText(java.lang.CharSequence, int);
@@ -44926,6 +44928,7 @@ package android.view.inputmethod { 
    ctor public InputConnectionWrapper(android.view.inputmethod.InputConnection, boolean);

    method public boolean beginBatchEdit();

    method public boolean clearMetaKeyStates(int);

    method public void closeConnection();

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

    method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);

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

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

+5 −5
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.view.inputmethod;



import android.annotation.CallSuper;

import android.content.Context;

import android.content.res.TypedArray;

import android.os.Bundle;
@@ -154,12 +155,11 @@ public class BaseInputConnection implements InputConnection { 
    }



    /**

     * Called when this InputConnection is no longer used by the InputMethodManager.

     *

     * @hide

     * Default implementation calls {@link #finishComposingText()}.

     */

    public void reportFinish() {

        // Intentionally empty

    @CallSuper

    public void closeConnection() {

        finishComposingText();

    }



    /**

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

+16 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ import android.view.KeyEvent; 
 *     was introduced in {@link android.os.Build.VERSION_CODES#N}.</li>

 *     <li>{@link #getHandler()}}, which was introduced in

 *     {@link android.os.Build.VERSION_CODES#N}.</li>

 *     <li>{@link #closeConnection()}}, which was introduced in

 *     {@link android.os.Build.VERSION_CODES#N}.</li>

 * </ul>

 *

 * <h3>Implementing an IME or an editor</h3>
@@ -820,4 +822,18 @@ public interface InputConnection { 
     * @return {@code null} to use the default {@link Handler}.

     */

    public Handler getHandler();



    /**

     * Called by the system up to only once to notify that the system is about to invalidate

     * connection between the input method and the application.

     *

     * <p><strong>Editor authors</strong>: You can clear all the nested batch edit right now and

     * you no longer need to handle subsequent callbacks on this connection, including

     * {@link #beginBatchEdit()}}.  Note that although the system tries to call this method whenever

     * possible, there may be a chance that this method is not called in some exceptional

     * situations.</p>

     *

     * <p>Note: This does nothing when called from input methods.</p>

     */

    public void closeConnection();

}