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

Commit 621c35e4 authored by Michael Wright's avatar Michael Wright Committed by Android Git Automerger
Browse files

am 765ddb4b: Merge "Separate sessionCreated and finishedEvents callbacks" into jb-mr2-dev 

* commit '765ddb4b':
  Separate sessionCreated and finishedEvents callbacks
parents f2cf401c 765ddb4b

Android.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -199,6 +199,7 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/view/IInputMethodClient.aidl \

	core/java/com/android/internal/view/IInputMethodClient.aidl \

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

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

	core/java/com/android/internal/view/IInputMethodSession.aidl \

	core/java/com/android/internal/view/IInputMethodSession.aidl \

	core/java/com/android/internal/view/IInputSessionCallback.aidl \

	core/java/com/android/internal/widget/ILockSettings.aidl \

	core/java/com/android/internal/widget/ILockSettings.aidl \

	core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \

	core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \

	core/java/com/android/internal/widget/IRemoteViewsAdapterConnection.aidl \

	core/java/com/android/internal/widget/IRemoteViewsAdapterConnection.aidl \

CleanSpec.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -156,6 +156,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/librtp_jni.so) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/lib/librtp_jni.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/lib/librtp_jni.so)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/SmsRawData.*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/SmsRawData.*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/view/IInputMethodCallback.*)

# ************************************************

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************
 
# ************************************************

core/java/android/inputmethodservice/IInputMethodWrapper.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -20,8 +20,8 @@ import com.android.internal.os.HandlerCaller; 
import com.android.internal.os.SomeArgs;

import com.android.internal.os.SomeArgs;

import com.android.internal.view.IInputContext;

import com.android.internal.view.IInputContext;

import com.android.internal.view.IInputMethod;

import com.android.internal.view.IInputMethod;

import com.android.internal.view.IInputMethodCallback;

import com.android.internal.view.IInputMethodSession;

import com.android.internal.view.IInputMethodSession;

import com.android.internal.view.IInputSessionCallback;

import com.android.internal.view.InputConnectionWrapper;

import com.android.internal.view.InputConnectionWrapper;





import android.content.Context;

import android.content.Context;
@@ -80,8 +80,8 @@ class IInputMethodWrapper extends IInputMethod.Stub 
    // NOTE: we should have a cache of these.

    // NOTE: we should have a cache of these.

    static class InputMethodSessionCallbackWrapper implements InputMethod.SessionCallback {

    static class InputMethodSessionCallbackWrapper implements InputMethod.SessionCallback {

        final Context mContext;

        final Context mContext;

        final IInputMethodCallback mCb;

        final IInputSessionCallback mCb;

        InputMethodSessionCallbackWrapper(Context context, IInputMethodCallback cb) {

        InputMethodSessionCallbackWrapper(Context context, IInputSessionCallback cb) {

            mContext = context;

            mContext = context;

            mCb = cb;

            mCb = cb;

        }

        }
@@ -175,7 +175,7 @@ class IInputMethodWrapper extends IInputMethod.Stub 
            }

            }

            case DO_CREATE_SESSION: {

            case DO_CREATE_SESSION: {

                inputMethod.createSession(new InputMethodSessionCallbackWrapper(

                inputMethod.createSession(new InputMethodSessionCallbackWrapper(

                        mCaller.mContext, (IInputMethodCallback)msg.obj));

                        mCaller.mContext, (IInputSessionCallback)msg.obj));

                return;

                return;

            }

            }

            case DO_SET_SESSION_ENABLED:

            case DO_SET_SESSION_ENABLED:
@@ -249,7 +249,7 @@ class IInputMethodWrapper extends IInputMethod.Stub 
                inputContext, attribute));

                inputContext, attribute));

    }

    }





    public void createSession(IInputMethodCallback callback) {

    public void createSession(IInputSessionCallback callback) {

        mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_CREATE_SESSION, callback));

        mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_CREATE_SESSION, callback));

    }

    }

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

+0 −5
Original line number Original line Diff line number Diff line
@@ -525,11 +525,6 @@ public final class InputMethodManager { 
        public void finishedEvent(int seq, boolean handled) {

        public void finishedEvent(int seq, boolean handled) {

            InputMethodManager.this.finishedEvent(seq, handled);

            InputMethodManager.this.finishedEvent(seq, handled);

        }

        }



        @Override

        public void sessionCreated(IInputMethodSession session) {

            // Stub -- not for use in the client.

        }

    };

    };

    

    

    InputMethodManager(IInputMethodManager service, Looper looper) {

    InputMethodManager(IInputMethodManager service, Looper looper) {

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

+2 −5
Original line number Original line Diff line number Diff line
@@ -16,17 +16,14 @@ 




package com.android.internal.view;

package com.android.internal.view;





import android.graphics.Rect;

import android.os.IBinder;

import android.os.IBinder;

import android.os.ResultReceiver;

import android.os.ResultReceiver;

import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.inputmethod.EditorInfo;

import android.view.inputmethod.EditorInfo;

import android.view.inputmethod.InputBinding;

import android.view.inputmethod.InputBinding;

import android.view.inputmethod.InputMethodSubtype;

import android.view.inputmethod.InputMethodSubtype;

import com.android.internal.view.IInputContext;

import com.android.internal.view.IInputContext;

import com.android.internal.view.IInputMethodCallback;

import com.android.internal.view.IInputMethodSession;

import com.android.internal.view.IInputMethodSession;

import com.android.internal.view.IInputSessionCallback;





/**

/**

 * Top-level interface to an input method component (implemented in a

 * Top-level interface to an input method component (implemented in a
@@ -44,7 +41,7 @@ oneway interface IInputMethod { 




    void restartInput(in IInputContext inputContext, in EditorInfo attribute);

    void restartInput(in IInputContext inputContext, in EditorInfo attribute);





    void createSession(IInputMethodCallback callback);

    void createSession(IInputSessionCallback  callback);





    void setSessionEnabled(IInputMethodSession session, boolean enabled);

    void setSessionEnabled(IInputMethodSession session, boolean enabled);