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

Commit bd120561 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge "Trivial method renaming for notifyTextCommitted"

parents d0969135 02970511

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

+1 −2
Original line number Diff line number Diff line
@@ -602,8 +602,7 @@ public class BaseInputConnection implements InputConnection { 
        

        beginBatchEdit();

        if (!composing && !TextUtils.isEmpty(text)) {

            // Notify the text is committed by the user to InputMethodManagerService

            mIMM.notifyTextCommitted();

            mIMM.notifyUserAction();

        }



        // delete composing text set previously.

core/java/android/view/inputmethod/InputMethodManager.java

+3 −3
Original line number Diff line number Diff line
@@ -1913,13 +1913,13 @@ public final class InputMethodManager { 
    }



    /**

     * Notify the current IME commits text

     * Notify that a user took some action with this input method.

     * @hide

     */

    public void notifyTextCommitted() {

    public void notifyUserAction() {

        synchronized (mH) {

            try {

                mService.notifyTextCommitted();

                mService.notifyUserAction();

            } catch (RemoteException e) {

                Log.w(TAG, "IME died: " + mCurId, e);

            }

core/java/com/android/internal/inputmethod/InputMethodSubtypeSwitchingController.java

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ public class InputMethodSubtypeSwitchingController { 
        return new InputMethodSubtypeSwitchingController(settings, context);

    }



    public void onCommitTextLocked(InputMethodInfo imi, InputMethodSubtype subtype) {

    public void onUserActionLocked(InputMethodInfo imi, InputMethodSubtype subtype) {

        if (mController == null) {

            if (DEBUG) {

                Log.e(TAG, "mController shouldn't be null.");

core/java/com/android/internal/view/IInputMethodManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -77,6 +77,6 @@ interface IInputMethodManager { 
    boolean setInputMethodEnabled(String id, boolean enabled);

    void setAdditionalInputMethodSubtypes(String id, in InputMethodSubtype[] subtypes);

    int getInputMethodWindowVisibleHeight();

    oneway void notifyTextCommitted();

    oneway void notifyUserAction();

    void setCursorAnchorMonitorMode(in IBinder token, int monitorMode);

}

services/core/java/com/android/server/InputMethodManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -2310,14 +2310,14 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
    }



    @Override

    public void notifyTextCommitted() {

    public void notifyUserAction() {

        if (DEBUG) {

            Slog.d(TAG, "Got the notification of commitText");

            Slog.d(TAG, "Got the notification of a user action");

        }

        synchronized (mMethodMap) {

            final InputMethodInfo imi = mMethodMap.get(mCurMethodId);

            if (imi != null) {

                mSwitchingController.onCommitTextLocked(imi, mCurrentSubtype);

                mSwitchingController.onUserActionLocked(imi, mCurrentSubtype);

            }

        }

    }