Merge "Revert "Add extra methods to trigger IME tracing dumps"" (7c889905) · Commits · e / os / android_frameworks_base

core/java/android/view/InsetsController.java

+2 −14

Original line number	Diff line number	Diff line
		@@ -1057,10 +1057,6 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
		boolean canRun = false;
		if (show) {
		// Show request
		if (fromIme) {
		ImeTracing.getInstance().triggerClientDump(
		"ImeInsetsSourceConsumer#requestShow", mHost.getInputMethodManager());
		}
		switch(consumer.requestShow(fromIme)) {
		case ShowResult.SHOW_IMMEDIATELY:
		canRun = true;
		@@ -1100,16 +1096,8 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
		+ fromIme);
		// We don't have a control at the moment. However, we still want to update requested
		// visibility state such that in case we get control, we can apply show animation.
		if (fromIme) {
		ImeTracing.getInstance().triggerClientDump(
		"InsetsSourceConsumer#show", mHost.getInputMethodManager());
		}
		consumer.show(fromIme);
		} else if (animationType == ANIMATION_TYPE_HIDE) {
		if (fromIme) {
		ImeTracing.getInstance().triggerClientDump(
		"InsetsSourceConsumer#hide", mHost.getInputMethodManager());
		}
		consumer.hide();
		}
		}
		@@ -1229,8 +1217,8 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation

		private void applyLocalVisibilityOverride() {
		for (int i = mSourceConsumers.size() - 1; i >= 0; i--) {
		final InsetsSourceConsumer consumer = mSourceConsumers.valueAt(i);
		consumer.applyLocalVisibilityOverride();
		final InsetsSourceConsumer controller = mSourceConsumers.valueAt(i);
		controller.applyLocalVisibilityOverride();
		}
		}

core/java/android/view/InsetsSourceConsumer.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import static android.view.InsetsSourceConsumerProto.IS_REQUESTED_VISIBLE;
		import static android.view.InsetsSourceConsumerProto.PENDING_FRAME;
		import static android.view.InsetsSourceConsumerProto.PENDING_VISIBLE_FRAME;
		import static android.view.InsetsSourceConsumerProto.SOURCE_CONTROL;
		import static android.view.InsetsState.ITYPE_IME;
		import static android.view.InsetsState.getDefaultVisibility;
		import static android.view.InsetsState.toPublicType;

		@@ -35,7 +34,6 @@ import android.annotation.IntDef;
		import android.annotation.Nullable;
		import android.graphics.Rect;
		import android.util.Log;
		import android.util.imetracing.ImeTracing;
		import android.util.proto.ProtoOutputStream;
		import android.view.InsetsState.InternalInsetsType;
		import android.view.SurfaceControl.Transaction;
		@@ -110,10 +108,6 @@ public class InsetsSourceConsumer {
		*/
		public void setControl(@Nullable InsetsSourceControl control,
		@InsetsType int[] showTypes, @InsetsType int[] hideTypes) {
		if (mType == ITYPE_IME) {
		ImeTracing.getInstance().triggerClientDump("InsetsSourceConsumer#setControl",
		mController.getHost().getInputMethodManager());
		}
		if (mSourceControl == control) {
		return;
		}
		@@ -243,12 +237,6 @@ public class InsetsSourceConsumer {
		final boolean isVisible = source != null ? source.isVisible() : getDefaultVisibility(mType);
		final boolean hasControl = mSourceControl != null;

		if (mType == ITYPE_IME) {
		ImeTracing.getInstance().triggerClientDump(
		"InsetsSourceConsumer#applyLocalVisibilityOverride",
		mController.getHost().getInputMethodManager());
		}

		// We still need to let the legacy app know the visibility change even if we don't have the
		// control. If we don't have the source, we don't change the requested visibility for making
		// the callback behavior compatible.

core/java/android/view/ViewRootImpl.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package android.view;
		import static android.view.Display.DEFAULT_DISPLAY;
		import static android.view.Display.INVALID_DISPLAY;
		import static android.view.InputDevice.SOURCE_CLASS_NONE;
		import static android.view.InsetsState.ITYPE_IME;
		import static android.view.InsetsState.ITYPE_NAVIGATION_BAR;
		import static android.view.InsetsState.ITYPE_STATUS_BAR;
		import static android.view.InsetsState.SIZE;
		@@ -7932,10 +7931,6 @@ public final class ViewRootImpl implements ViewParent,
		if (mTranslator != null) {
		mTranslator.translateInsetsStateInScreenToAppWindow(insetsState);
		}
		if (insetsState != null && insetsState.getSource(ITYPE_IME).isVisible()) {
		ImeTracing.getInstance().triggerClientDump("ViewRootImpl#dispatchInsetsChanged",
		getInsetsController().getHost().getInputMethodManager());
		}
		mHandler.obtainMessage(MSG_INSETS_CHANGED, insetsState).sendToTarget();
		}

		@@ -7952,10 +7947,6 @@ public final class ViewRootImpl implements ViewParent,
		if (mTranslator != null) {
		mTranslator.translateInsetsStateInScreenToAppWindow(insetsState);
		}
		if (insetsState != null && insetsState.getSource(ITYPE_IME).isVisible()) {
		ImeTracing.getInstance().triggerClientDump("ViewRootImpl#dispatchInsetsControlChanged",
		getInsetsController().getHost().getInputMethodManager());
		}
		SomeArgs args = SomeArgs.obtain();
		args.arg1 = insetsState;
		args.arg2 = activeControls;

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

+0 −13

Original line number	Diff line number	Diff line
		@@ -598,8 +598,6 @@ public final class InputMethodManager {
		*/
		@Override
		public void finishInput() {
		ImeTracing.getInstance().triggerClientDump(
		"InputMethodManager.DelegateImpl#finishInput", InputMethodManager.this);
		synchronized (mH) {
		finishInputLocked();
		}
		@@ -643,10 +641,6 @@ public final class InputMethodManager {
		int startInputFlags = getStartInputFlags(focusedView, 0);
		startInputFlags \|= StartInputFlags.WINDOW_GAINED_FOCUS;

		ImeTracing.getInstance().triggerClientDump(
		"InputMethodManager.DelegateImpl#startInputAsyncOnWindowFocusGain",
		InputMethodManager.this);

		final ImeFocusController controller = getFocusController();
		if (controller == null) {
		return;
		@@ -956,9 +950,6 @@ public final class InputMethodManager {
		case MSG_APPLY_IME_VISIBILITY: {
		synchronized (mH) {
		if (mImeInsetsConsumer != null) {
		ImeTracing.getInstance().triggerClientDump(
		"ImeInsetsSourceConsumer#applyImeVisibility",
		InputMethodManager.this);
		mImeInsetsConsumer.applyImeVisibility(msg.arg1 != 0);
		}
		}
		@@ -1869,8 +1860,6 @@ public final class InputMethodManager {
		* {@link #HIDE_NOT_ALWAYS} bit set.
		**/
		public void toggleSoftInputFromWindow(IBinder windowToken, int showFlags, int hideFlags) {
		ImeTracing.getInstance().triggerClientDump(
		"InputMethodManager#toggleSoftInputFromWindow", InputMethodManager.this);
		synchronized (mH) {
		final View servedView = getServedViewLocked();
		if (servedView == null \|\| servedView.getWindowToken() != windowToken) {
		@@ -1898,8 +1887,6 @@ public final class InputMethodManager {
		* {@link #HIDE_NOT_ALWAYS} bit set.
		*/
		public void toggleSoftInput(int showFlags, int hideFlags) {
		ImeTracing.getInstance().triggerClientDump(
		"InputMethodManager#toggleSoftInput", InputMethodManager.this);
		if (mCurMethod != null) {
		try {
		mCurMethod.toggleSoftInput(showFlags, hideFlags);