summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-09-02 14:50:25 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-02 14:50:25 -0700
commit26d708d93624d2d060529b7e33e0a20172e85efd (patch)
treef808a9204dd940bae9dbcb9eb9d2404aedca892d /core/java
parent3ac85d31de6cab5a468b7728b3340cf1b57bc8fe (diff)
parenta18cf547317d3602b5476ee4b9e206fe4c12d7b5 (diff)
downloadframeworks_base-26d708d93624d2d060529b7e33e0a20172e85efd.zip
frameworks_base-26d708d93624d2d060529b7e33e0a20172e85efd.tar.gz
frameworks_base-26d708d93624d2d060529b7e33e0a20172e85efd.tar.bz2
Merge "InputMethodManager showSoftInput return documentation." into gingerbread
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/inputmethod/InputMethodManager.java15
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) {