commit d180232e92b78067beb7f84d7f3d1d21865f0594
author Gilles Debunne <debunne@google.com> Thu Sep 02 15:29:14 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 02 15:29:14 2010 -0700
tree cd8fa3a6f18bfb11016cbe7c0a16aaee9944d6fe
parent 947e25e5ffe13549dab82580ef05f1f4faf42cd2
parent d4723bb415dc70008c744d1027c3e3d9473adfe1

Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread

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

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.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 @@
             super(mainLooper, conn);
         }
 
-        @Override
         public boolean isActive() {
             return mActive;
         }
@@ -735,7 +739,6 @@
      * 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) {