summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/view/inputmethod/ImeTracker.java18
-rw-r--r--core/java/android/view/inputmethod/InputMethodManager.java6
2 files changed, 3 insertions, 21 deletions
diff --git a/core/java/android/view/inputmethod/ImeTracker.java b/core/java/android/view/inputmethod/ImeTracker.java
index 31c03632665b..34e4555aab4d 100644
--- a/core/java/android/view/inputmethod/ImeTracker.java
+++ b/core/java/android/view/inputmethod/ImeTracker.java
@@ -335,15 +335,6 @@ public interface ImeTracker {
@SoftInputShowHideReason int reason, boolean fromUser);
/**
- * Alias for {@link #onRequestShow(String, int, int, int, boolean)} with
- * {@code fromUser} set to {@code false}.
- */
- default Token onRequestShow(@Nullable String component, int uid, @Origin int origin,
- @SoftInputShowHideReason int reason) {
- return onRequestShow(component, uid, origin, reason, false /* fromUser */);
- }
-
- /**
* Creates an IME hide request tracking token.
*
* @param component the name of the component that created the IME request, or {@code null}
@@ -360,15 +351,6 @@ public interface ImeTracker {
@SoftInputShowHideReason int reason, boolean fromUser);
/**
- * Alias for {@link #onRequestHide(String, int, int, int, boolean)} with
- * {@code fromUser} set to {@code false}.
- */
- default Token onRequestHide(@Nullable String component, int uid, @Origin int origin,
- @SoftInputShowHideReason int reason) {
- return onRequestHide(component, uid, origin, reason, false /* fromUser */);
- }
-
- /**
* Called when an IME request progresses to a further phase.
*
* @param token the token tracking the current IME request or {@code null} otherwise.
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 3d70c5ba0715..6795c8a80bb2 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -2199,7 +2199,7 @@ public final class InputMethodManager {
synchronized (mH) {
final ImeTracker.Token statsToken = ImeTracker.forLogging().onRequestShow(
null /* component */, Process.myUid(), ImeTracker.ORIGIN_CLIENT_SHOW_SOFT_INPUT,
- SoftInputShowHideReason.SHOW_SOFT_INPUT);
+ SoftInputShowHideReason.SHOW_SOFT_INPUT, false /* fromUser */);
Log.w(TAG, "showSoftInputUnchecked() is a hidden method, which will be"
+ " removed soon. If you are using androidx.appcompat.widget.SearchView,"
@@ -3138,7 +3138,7 @@ public final class InputMethodManager {
void closeCurrentInput() {
final ImeTracker.Token statsToken = ImeTracker.forLogging().onRequestHide(
null /* component */, Process.myUid(), ImeTracker.ORIGIN_CLIENT_HIDE_SOFT_INPUT,
- SoftInputShowHideReason.HIDE_CLOSE_CURRENT_SESSION);
+ SoftInputShowHideReason.HIDE_CLOSE_CURRENT_SESSION, false /* fromUser */);
ImeTracker.forLatency().onRequestHide(statsToken, ImeTracker.ORIGIN_CLIENT_HIDE_SOFT_INPUT,
SoftInputShowHideReason.HIDE_CLOSE_CURRENT_SESSION,
ActivityThread::currentApplication);
@@ -3238,7 +3238,7 @@ public final class InputMethodManager {
if (statsToken == null) {
statsToken = ImeTracker.forLogging().onRequestHide(null /* component */,
Process.myUid(), ImeTracker.ORIGIN_CLIENT_HIDE_SOFT_INPUT,
- SoftInputShowHideReason.HIDE_SOFT_INPUT_BY_INSETS_API);
+ SoftInputShowHideReason.HIDE_SOFT_INPUT_BY_INSETS_API, false /* fromUser */);
}
ImeTracker.forLatency().onRequestHide(statsToken, ImeTracker.ORIGIN_CLIENT_HIDE_SOFT_INPUT,
SoftInputShowHideReason.HIDE_SOFT_INPUT_BY_INSETS_API,