Add FLAG_INPUT_METHOD_EDITOR to a11y (8cb76d59) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -3259,6 +3259,7 @@ package android.accessibilityservice {
		field public static final int FEEDBACK_VISUAL = 8; // 0x8
		field public static final int FLAG_ENABLE_ACCESSIBILITY_VOLUME = 128; // 0x80
		field public static final int FLAG_INCLUDE_NOT_IMPORTANT_VIEWS = 2; // 0x2
		field public static final int FLAG_INPUT_METHOD_EDITOR = 32768; // 0x8000
		field public static final int FLAG_REPORT_VIEW_IDS = 16; // 0x10
		field public static final int FLAG_REQUEST_2_FINGER_PASSTHROUGH = 8192; // 0x2000
		field public static final int FLAG_REQUEST_ACCESSIBILITY_BUTTON = 256; // 0x100

core/java/android/accessibilityservice/AccessibilityService.java

+12 −6

Original line number	Diff line number	Diff line
		@@ -825,11 +825,17 @@ public abstract class AccessibilityService extends Service {
		for (int i = 0; i < mMagnificationControllers.size(); i++) {
		mMagnificationControllers.valueAt(i).onServiceConnectedLocked();
		}
		// TODO(b/187453053): If service requested ime capabilities
		if (!mInputMethodInitialized) {
		AccessibilityServiceInfo info = getServiceInfo();
		if (info != null) {
		boolean requestIme = (info.flags
		& AccessibilityServiceInfo.FLAG_INPUT_METHOD_EDITOR) != 0;
		if (requestIme && !mInputMethodInitialized) {
		mInputMethod = onCreateInputMethod();
		mInputMethodInitialized = true;
		}
		} else {
		Log.e(LOG_TAG, "AccessibilityServiceInfo is null in dispatchServiceConnected");
		}
		}
		if (mSoftKeyboardController != null) {
		mSoftKeyboardController.onServiceConnected();
		@@ -1885,7 +1891,7 @@ public abstract class AccessibilityService extends Service {
		/**
		* The default implementation returns our default {@link InputMethod}. Subclasses can override
		* it to provide their own customized version. Accessibility services need to set the
		* {@link AccessibilityServiceInfo#FLAG_REQUEST_IME_APIS} flag to use input method APIs.
		* {@link AccessibilityServiceInfo#FLAG_INPUT_METHOD_EDITOR} flag to use input method APIs.
		*
		* @return the InputMethod.
		*/
		@@ -1898,7 +1904,7 @@ public abstract class AccessibilityService extends Service {
		* Returns the InputMethod instance after the system calls {@link #onCreateInputMethod()},
		* which may be used to input text or get editable text selection change notifications. It will
		* return null if the accessibility service doesn't set the
		* {@link AccessibilityServiceInfo#FLAG_REQUEST_IME_APIS} flag or the system doesn't call
		* {@link AccessibilityServiceInfo#FLAG_INPUT_METHOD_EDITOR} flag or the system doesn't call
		* {@link #onCreateInputMethod()}.
		*
		* @return the InputMethod instance

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -390,6 +390,15 @@ public class AccessibilityServiceInfo implements Parcelable {
		*/
		public static final int FLAG_SEND_MOTION_EVENTS = 0x0004000;

		/**
		* This flag makes the AccessibilityService an input method editor with a subset of input
		* method editor capabilities: get the {@link android.view.inputmethod.InputConnection} and get
		* text selection change notifications.
		*
		* @see AccessibilityService#getInputMethod()
		*/
		public static final int FLAG_INPUT_METHOD_EDITOR = 0x0008000;

		/** {@hide} */
		public static final int FLAG_FORCE_DIRECT_BOOT_AWARE = 0x00010000;

		@@ -497,6 +506,7 @@ public class AccessibilityServiceInfo implements Parcelable {
		* @see #FLAG_ENABLE_ACCESSIBILITY_VOLUME
		* @see #FLAG_REQUEST_ACCESSIBILITY_BUTTON
		* @see #FLAG_REQUEST_SHORTCUT_WARNING_DIALOG_SPOKEN_FEEDBACK
		* @see #FLAG_INPUT_METHOD_EDITOR
		*/
		public int flags;

		@@ -1332,6 +1342,8 @@ public class AccessibilityServiceInfo implements Parcelable {
		return "FLAG_REQUEST_FINGERPRINT_GESTURES";
		case FLAG_REQUEST_SHORTCUT_WARNING_DIALOG_SPOKEN_FEEDBACK:
		return "FLAG_REQUEST_SHORTCUT_WARNING_DIALOG_SPOKEN_FEEDBACK";
		case FLAG_INPUT_METHOD_EDITOR:
		return "FLAG_INPUT_METHOD_EDITOR";
		default:
		return null;
		}

core/java/android/accessibilityservice/InputMethod.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ import java.util.concurrent.Executor;
		* developers should override them as needed. Developers should also override
		* {@link AccessibilityService#onCreateInputMethod()} to return
		* their custom InputMethod implementation. Accessibility services also need to set the
		* {@link AccessibilityServiceInfo#FLAG_REQUEST_IME_APIS} flag to use input method APIs.
		* {@link AccessibilityServiceInfo#FLAG_INPUT_METHOD_EDITOR} flag to use input method APIs.
		*/
		public class InputMethod {
		private static final String LOG_TAG = "A11yInputMethod";

core/res/res/values/attrs.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -3910,6 +3910,8 @@
		<!-- Has flag {@link android.accessibilityservice.AccessibilityServiceInfo#FLAG_REQUEST_MULTI_FINGER_GESTURES}. -->
		<flag name="flagRequestMultiFingerGestures" value="0x00001000" />
		<flag name="flagSendMotionEvents" value="0x0004000" />
		<!-- Has flag {@link android.accessibilityservice.AccessibilityServiceInfo#FLAG_INPUT_METHOD_EDITOR}. -->
		<flag name="flagInputMethodEditor" value="0x0008000" />
		</attr>
		<!-- Component name of an activity that allows the user to modify
		the settings for this service. This setting cannot be changed at runtime. -->