Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d180232e: Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread

Browse Source 
Merge commit 'd180232e92b78067beb7f84d7f3d1d21865f0594' into gingerbread-plus-aosp

* commit 'd180232e92b78067beb7f84d7f3d1d21865f0594':
  Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
This commit is contained in:
Gilles Debunne
2010-09-02 15:34:24 -07:00
committed by Android Git Automerger
parent 4ca550a17b d180232e92
commit ece9e19478
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/view/inputmethod/InputMethodManager.java
View File

@@ -16,10 +16,6 @@
package android.view.inputmethod; 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.content.Context;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.Bundle; import android.os.Bundle;
@@ -38,6 +34,15 @@ import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewRoot; 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.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.List; import java.util.List;
@@ -379,7 +384,6 @@ public final class InputMethodManager {
super(mainLooper, conn); super(mainLooper, conn);
} }
@Override
public boolean isActive() { public boolean isActive() {
return mActive; return mActive;
} }
@@ -735,7 +739,6 @@ public final class InputMethodManager {
* code you receive may be either {@link #RESULT_UNCHANGED_SHOWN}, * code you receive may be either {@link #RESULT_UNCHANGED_SHOWN},
* {@link #RESULT_UNCHANGED_HIDDEN}, {@link #RESULT_SHOWN}, or * {@link #RESULT_UNCHANGED_HIDDEN}, {@link #RESULT_SHOWN}, or
* {@link #RESULT_HIDDEN}. * {@link #RESULT_HIDDEN}.
* @return false if a problem occurred, true otherwise.
*/ */
public boolean showSoftInput(View view, int flags, public boolean showSoftInput(View view, int flags,
ResultReceiver resultReceiver) { ResultReceiver resultReceiver) {