diff options
author | Gilles Debunne <debunne@google.com> | 2010-09-02 14:59:58 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-02 14:59:58 -0700 |
commit | 25962adc733be1fa7e06ba28a708880f5e66a8da (patch) | |
tree | 22c7b53602aff98ba066ced44ad490765c6e1e5f /core/java/android/view/inputmethod | |
parent | aa904f48cf3e3a31cc43806fee0e17af607c7fae (diff) | |
parent | 5402c34b2717fd4885782a8fc631b3b66162d140 (diff) | |
download | frameworks_base-25962adc733be1fa7e06ba28a708880f5e66a8da.zip frameworks_base-25962adc733be1fa7e06ba28a708880f5e66a8da.tar.gz frameworks_base-25962adc733be1fa7e06ba28a708880f5e66a8da.tar.bz2 |
am 5402c34b: am 26d708d9: Merge "InputMethodManager showSoftInput return documentation." into gingerbread
Merge commit '5402c34b2717fd4885782a8fc631b3b66162d140'
* commit '5402c34b2717fd4885782a8fc631b3b66162d140':
InputMethodManager showSoftInput return documentation.
Diffstat (limited to 'core/java/android/view/inputmethod')
-rw-r--r-- | core/java/android/view/inputmethod/InputMethodManager.java | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index e30687f..adee260 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -16,6 +16,10 @@ 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; @@ -34,15 +38,6 @@ 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; @@ -384,6 +379,7 @@ public final class InputMethodManager { super(mainLooper, conn); } + @Override public boolean isActive() { return mActive; } @@ -739,6 +735,7 @@ 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) { |