Merge "Inline fromUser variants of ImeTracker show/hide" into main (ed18b0e3) · Commits · e / os / android_frameworks_base

core/java/android/view/inputmethod/ImeTracker.java

+0 −18

Original line number	Diff line number	Diff line
		@@ -339,15 +339,6 @@ public interface ImeTracker {
		Token onRequestShow(@Nullable String component, int uid, @Origin int origin,
		@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.
		*
		@@ -364,15 +355,6 @@ public interface ImeTracker {
		Token onRequestHide(@Nullable String component, int uid, @Origin int origin,
		@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.
		*

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -2328,7 +2328,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,"
		@@ -3538,7 +3538,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);
		@@ -3638,7 +3638,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,