Merge "Remove InputMethodManagerDelegate#startInput()"
diff --git a/core/java/android/view/ImeFocusController.java b/core/java/android/view/ImeFocusController.java
index 1afd048..4e162f5 100644
--- a/core/java/android/view/ImeFocusController.java
+++ b/core/java/android/view/ImeFocusController.java
@@ -26,8 +26,6 @@
import android.view.inputmethod.InputMethodManager;
import com.android.internal.inputmethod.InputMethodDebug;
-import com.android.internal.inputmethod.StartInputFlags;
-import com.android.internal.inputmethod.StartInputReason;
/**
* Responsible for IME focus handling inside {@link ViewRootImpl}.
@@ -189,13 +187,6 @@
* @hide
*/
public interface InputMethodManagerDelegate {
- /**
- * Starts the input connection.
- */
- boolean startInput(@StartInputReason int startInputReason, View focusedView,
- @StartInputFlags int startInputFlags,
- @WindowManager.LayoutParams.SoftInputModeFlags int softInputMode, int windowFlags);
-
void onPostWindowFocus(View viewForWindowFocus,
@NonNull WindowManager.LayoutParams windowAttribute);
void onViewFocusChanged(@NonNull View view, boolean hasFocus);
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 08a7583..2e8ee77 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -737,11 +737,8 @@
private final class DelegateImpl implements
ImeFocusController.InputMethodManagerDelegate {
- /**
- * Used by {@link ImeFocusController} to start input connection.
- */
- @Override
- public boolean startInput(@StartInputReason int startInputReason, View focusedView,
+
+ private boolean startInput(@StartInputReason int startInputReason, View focusedView,
@StartInputFlags int startInputFlags, @SoftInputModeFlags int softInputMode,
int windowFlags) {
ImeTracing.getInstance().triggerClientDump(