am d180232e: Merge "Revert "Merge "InputMethodManager showSoftInput return... (ece9e194) · Commits · e / os / android_frameworks_base

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

+9 −6

Original line number	Diff line number	Diff line
		@@ -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) {