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

Commit 9da8464a authored by Yohei Yukawa's avatar Yohei Yukawa Committed by android-build-merger
Browse files

Merge "Introduce InputConnection#getHandler()." into nyc-dev am: 116d872d 

am: 887f7c0f

* commit '887f7c0f':
  Introduce InputConnection#getHandler().
parents 459725db 887f7c0f

api/current.txt

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

    method public int getCursorCapsMode(int);

    method public android.text.Editable getEditable();

    method public android.text.Editable getEditable();

    method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public android.os.Handler getHandler();

    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);
@@ -44519,6 +44520,7 @@ package android.view.inputmethod { 
    method public abstract boolean finishComposingText();

    method public abstract boolean finishComposingText();

    method public abstract int getCursorCapsMode(int);

    method public abstract int getCursorCapsMode(int);

    method public abstract android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public abstract android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public abstract android.os.Handler getHandler();

    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);
@@ -44550,6 +44552,7 @@ package android.view.inputmethod { 
    method public boolean finishComposingText();

    method public boolean finishComposingText();

    method public int getCursorCapsMode(int);

    method public int getCursorCapsMode(int);

    method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public android.os.Handler getHandler();

    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);

api/system-current.txt

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

    method public int getCursorCapsMode(int);

    method public android.text.Editable getEditable();

    method public android.text.Editable getEditable();

    method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public android.os.Handler getHandler();

    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);
@@ -47280,6 +47281,7 @@ package android.view.inputmethod { 
    method public abstract boolean finishComposingText();

    method public abstract boolean finishComposingText();

    method public abstract int getCursorCapsMode(int);

    method public abstract int getCursorCapsMode(int);

    method public abstract android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public abstract android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public abstract android.os.Handler getHandler();

    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);
@@ -47311,6 +47313,7 @@ package android.view.inputmethod { 
    method public boolean finishComposingText();

    method public boolean finishComposingText();

    method public int getCursorCapsMode(int);

    method public int getCursorCapsMode(int);

    method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public android.os.Handler getHandler();

    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);

api/test-current.txt

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

    method public int getCursorCapsMode(int);

    method public android.text.Editable getEditable();

    method public android.text.Editable getEditable();

    method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public android.os.Handler getHandler();

    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);
@@ -44536,6 +44537,7 @@ package android.view.inputmethod { 
    method public abstract boolean finishComposingText();

    method public abstract boolean finishComposingText();

    method public abstract int getCursorCapsMode(int);

    method public abstract int getCursorCapsMode(int);

    method public abstract android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public abstract android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public abstract android.os.Handler getHandler();

    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);
@@ -44567,6 +44569,7 @@ package android.view.inputmethod { 
    method public boolean finishComposingText();

    method public boolean finishComposingText();

    method public int getCursorCapsMode(int);

    method public int getCursorCapsMode(int);

    method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);

    method public android.os.Handler getHandler();

    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);

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package android.view.inputmethod; 
import android.content.Context;

import android.content.Context;

import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.os.Bundle;

import android.os.Bundle;

import android.os.Handler;

import android.os.SystemClock;

import android.os.SystemClock;

import android.text.Editable;

import android.text.Editable;

import android.text.NoCopySpan;

import android.text.NoCopySpan;
@@ -602,6 +603,10 @@ public class BaseInputConnection implements InputConnection { 
        return false;

        return false;

    }

    }





    public Handler getHandler() {

        return null;

    }



    /**

    /**

     * The default implementation places the given text into the editable,

     * The default implementation places the given text into the editable,

     * replacing any existing composing text.  The new text is marked as

     * replacing any existing composing text.  The new text is marked as

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

+12 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.view.inputmethod;

package android.view.inputmethod;





import android.os.Bundle;

import android.os.Bundle;

import android.os.Handler;

import android.view.KeyCharacterMap;

import android.view.KeyCharacterMap;

import android.view.KeyEvent;

import android.view.KeyEvent;
@@ -786,4 +787,15 @@ public interface InputConnection { 
     * {@link InputMethodManager#updateCursorAnchorInfo(android.view.View, CursorAnchorInfo)}.

     * {@link InputMethodManager#updateCursorAnchorInfo(android.view.View, CursorAnchorInfo)}.

     */

     */

    public boolean requestCursorUpdates(int cursorUpdateMode);

    public boolean requestCursorUpdates(int cursorUpdateMode);



    /**

     * Called by the {@link InputMethodManager} to enable application developers to specify a

     * dedicated {@link Handler} on which incoming IPC method calls from input methods will be

     * dispatched.

     *

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

     *

     * @return {@code null} to use the default {@link Handler}.

     */

    public Handler getHandler();

}
 
}