Merge "Remove useHandwritingListenerForTooltype flag" into main (96d13243) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/InputMethodService.java

+5 −8

Original line number	Diff line number	Diff line
		@@ -1326,11 +1326,10 @@ public class InputMethodService extends AbstractInputMethodService {
		}

		private void updateEditorToolTypeInternal(int toolType) {
		if (Flags.useHandwritingListenerForTooltype()) {
		if (mInputEditorInfo != null) {
		mInputEditorInfo.setInitialToolType(toolType);
		}
		}

		onUpdateEditorToolType(toolType);
		}

		@@ -3652,10 +3651,8 @@ public class InputMethodService extends AbstractInputMethodService {
		* had not seen the event at all.
		*/
		public boolean onKeyDown(int keyCode, KeyEvent event) {
		if (Flags.useHandwritingListenerForTooltype()) {
		// any KeyEvent keyDown should reset last toolType.
		updateEditorToolTypeInternal(MotionEvent.TOOL_TYPE_UNKNOWN);
		}

		if (keyCode == KeyEvent.KEYCODE_BACK) {
		final ExtractEditText eet = getExtractEditTextIfVisible();

+0 −8

Original line number	Diff line number	Diff line
		@@ -35,14 +35,6 @@ flag {
		bug: "279959705"
		}

		flag {
		name: "use_handwriting_listener_for_tooltype"
		namespace: "input_method"
		description: "Feature flag for using handwriting spy for determining pointer toolType."
		bug: "309554999"
		is_fixed_read_only: true
		}

		flag {
		name: "use_zero_jank_proxy"
		is_exported: true

+1 −5

Original line number	Diff line number	Diff line
		@@ -3384,11 +3384,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		ImeTracker.forLogging().onProgress(statsToken, ImeTracker.PHASE_SERVER_HAS_IME);
		userData.mCurStatsToken = null;

		if (Flags.useHandwritingListenerForTooltype()) {
		maybeReportToolType(userId);
		} else if (lastClickToolType != MotionEvent.TOOL_TYPE_UNKNOWN) {
		onUpdateEditorToolTypeLocked(lastClickToolType, userId);
		}
		mVisibilityApplier.performShowIme(windowToken, statsToken,
		visibilityStateComputer.getShowFlagsForInputMethodServiceOnly(),
		resultReceiver, reason, userId);