diff options
Diffstat (limited to 'core/java')
5 files changed, 36 insertions, 23 deletions
diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java index 1128230..0d981be 100644 --- a/core/java/android/inputmethodservice/IInputMethodWrapper.java +++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java @@ -20,8 +20,8 @@ import com.android.internal.os.HandlerCaller; import com.android.internal.os.SomeArgs; import com.android.internal.view.IInputContext; import com.android.internal.view.IInputMethod; -import com.android.internal.view.IInputMethodCallback; import com.android.internal.view.IInputMethodSession; +import com.android.internal.view.IInputSessionCallback; import com.android.internal.view.InputConnectionWrapper; import android.content.Context; @@ -80,8 +80,8 @@ class IInputMethodWrapper extends IInputMethod.Stub // NOTE: we should have a cache of these. static class InputMethodSessionCallbackWrapper implements InputMethod.SessionCallback { final Context mContext; - final IInputMethodCallback mCb; - InputMethodSessionCallbackWrapper(Context context, IInputMethodCallback cb) { + final IInputSessionCallback mCb; + InputMethodSessionCallbackWrapper(Context context, IInputSessionCallback cb) { mContext = context; mCb = cb; } @@ -175,7 +175,7 @@ class IInputMethodWrapper extends IInputMethod.Stub } case DO_CREATE_SESSION: { inputMethod.createSession(new InputMethodSessionCallbackWrapper( - mCaller.mContext, (IInputMethodCallback)msg.obj)); + mCaller.mContext, (IInputSessionCallback)msg.obj)); return; } case DO_SET_SESSION_ENABLED: @@ -249,7 +249,7 @@ class IInputMethodWrapper extends IInputMethod.Stub inputContext, attribute)); } - public void createSession(IInputMethodCallback callback) { + public void createSession(IInputSessionCallback callback) { mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_CREATE_SESSION, callback)); } diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index d258f4d..dba2354 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -525,11 +525,6 @@ public final class InputMethodManager { public void finishedEvent(int seq, boolean handled) { InputMethodManager.this.finishedEvent(seq, handled); } - - @Override - public void sessionCreated(IInputMethodSession session) { - // Stub -- not for use in the client. - } }; InputMethodManager(IInputMethodManager service, Looper looper) { diff --git a/core/java/com/android/internal/view/IInputMethod.aidl b/core/java/com/android/internal/view/IInputMethod.aidl index 5db860b..bd947e9 100644 --- a/core/java/com/android/internal/view/IInputMethod.aidl +++ b/core/java/com/android/internal/view/IInputMethod.aidl @@ -16,17 +16,14 @@ package com.android.internal.view; -import android.graphics.Rect; import android.os.IBinder; import android.os.ResultReceiver; -import android.view.KeyEvent; -import android.view.MotionEvent; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputBinding; import android.view.inputmethod.InputMethodSubtype; import com.android.internal.view.IInputContext; -import com.android.internal.view.IInputMethodCallback; import com.android.internal.view.IInputMethodSession; +import com.android.internal.view.IInputSessionCallback; /** * 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 createSession(IInputMethodCallback callback); + void createSession(IInputSessionCallback callback); void setSessionEnabled(IInputMethodSession session, boolean enabled); diff --git a/core/java/com/android/internal/view/IInputMethodCallback.aidl b/core/java/com/android/internal/view/IInputMethodCallback.aidl index 480cc0e..717a82d 100644 --- a/core/java/com/android/internal/view/IInputMethodCallback.aidl +++ b/core/java/com/android/internal/view/IInputMethodCallback.aidl @@ -16,13 +16,6 @@ package com.android.internal.view; -import android.graphics.Rect; -import android.view.KeyEvent; -import android.view.MotionEvent; -import com.android.internal.view.IInputContext; -import com.android.internal.view.IInputMethodSession; -import android.os.IBinder; - /** * Helper interface for IInputMethod to allow the input method to call back * to its client with results from incoming calls. @@ -30,5 +23,4 @@ import android.os.IBinder; */ oneway interface IInputMethodCallback { void finishedEvent(int seq, boolean handled); - void sessionCreated(IInputMethodSession session); } diff --git a/core/java/com/android/internal/view/IInputSessionCallback.aidl b/core/java/com/android/internal/view/IInputSessionCallback.aidl new file mode 100644 index 0000000..2b48f33 --- /dev/null +++ b/core/java/com/android/internal/view/IInputSessionCallback.aidl @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.view; + +import com.android.internal.view.IInputMethodSession; + +/** + * Helper interface for IInputMethod to allow the input method to notify the client when a new + * session has been created. + * {@hide} + */ + +oneway interface IInputSessionCallback { + void sessionCreated(IInputMethodSession session); +} |