diff options
| author | Gilles Debunne <debunne@google.com> | 2010-09-02 15:34:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-02 15:34:24 -0700 |
| commit | ece9e1947831a46b5d67b1a3d3d8e0189e38d983 (patch) | |
| tree | 47056561762d891853563234c5be515a492bfc7d /core | |
| parent | 4ca550a17b8becdf6b5a32909fb5c70ef7579f4e (diff) | |
| parent | d180232e92b78067beb7f84d7f3d1d21865f0594 (diff) | |
| download | frameworks_base-ece9e1947831a46b5d67b1a3d3d8e0189e38d983.zip frameworks_base-ece9e1947831a46b5d67b1a3d3d8e0189e38d983.tar.gz frameworks_base-ece9e1947831a46b5d67b1a3d3d8e0189e38d983.tar.bz2 | |
am d180232e: Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread
Merge commit 'd180232e92b78067beb7f84d7f3d1d21865f0594' into gingerbread-plus-aosp
* commit 'd180232e92b78067beb7f84d7f3d1d21865f0594':
Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/inputmethod/InputMethodManager.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index adee260..e30687f 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -16,10 +16,6 @@ package android.view.inputmethod; -import com.android.internal.os.HandlerCaller; -import com.android.internal.view.IInputConnectionWrapper; -import com.android.internal.view.InputBindResult; - import android.content.Context; import android.graphics.Rect; import android.os.Bundle; @@ -38,6 +34,15 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewRoot; +import com.android.internal.os.HandlerCaller; +import com.android.internal.view.IInputConnectionWrapper; +import com.android.internal.view.IInputContext; +import com.android.internal.view.IInputMethodCallback; +import com.android.internal.view.IInputMethodClient; +import com.android.internal.view.IInputMethodManager; +import com.android.internal.view.IInputMethodSession; +import com.android.internal.view.InputBindResult; + import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.List; @@ -379,7 +384,6 @@ public final class InputMethodManager { super(mainLooper, conn); } - @Override public boolean isActive() { return mActive; } @@ -735,7 +739,6 @@ public final class InputMethodManager { * code you receive may be either {@link #RESULT_UNCHANGED_SHOWN}, * {@link #RESULT_UNCHANGED_HIDDEN}, {@link #RESULT_SHOWN}, or * {@link #RESULT_HIDDEN}. - * @return false if a problem occurred, true otherwise. */ public boolean showSoftInput(View view, int flags, ResultReceiver resultReceiver) { |