Merge "Change API name for a11y keyboard flag" (ec2b4992) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -2826,7 +2826,7 @@ package android.accessibilityservice {
		field public static final java.lang.String SERVICE_META_DATA = "android.accessibilityservice";
		field public static final int SHOW_MODE_AUTO = 0; // 0x0
		field public static final int SHOW_MODE_HIDDEN = 1; // 0x1
		field public static final int SHOW_MODE_WITH_HARD_KEYBOARD = 2; // 0x2
		field public static final int SHOW_MODE_IGNORE_HARD_KEYBOARD = 2; // 0x2
		}

		public static abstract class AccessibilityService.GestureResultCallback {

core/java/android/accessibilityservice/AccessibilityService.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -399,7 +399,7 @@ public abstract class AccessibilityService extends Service {
		@IntDef(prefix = { "SHOW_MODE_" }, value = {
		SHOW_MODE_AUTO,
		SHOW_MODE_HIDDEN,
		SHOW_MODE_WITH_HARD_KEYBOARD
		SHOW_MODE_IGNORE_HARD_KEYBOARD
		})
		public @interface SoftKeyboardShowMode {}

		@@ -419,7 +419,7 @@ public abstract class AccessibilityService extends Service {
		* Allow the soft keyboard to be shown, even if a hard keyboard is connected
		* @see SoftKeyboardController
		*/
		public static final int SHOW_MODE_WITH_HARD_KEYBOARD = 2;
		public static final int SHOW_MODE_IGNORE_HARD_KEYBOARD = 2;

		/**
		* Mask used to cover the show modes supported in public API
		@@ -1205,7 +1205,7 @@ public abstract class AccessibilityService extends Service {
		*
		* @see AccessibilityService#SHOW_MODE_AUTO
		* @see AccessibilityService#SHOW_MODE_HIDDEN
		* @see AccessibilityService#SHOW_MODE_WITH_HARD_KEYBOARD
		* @see AccessibilityService#SHOW_MODE_IGNORE_HARD_KEYBOARD
		*/
		public static final class SoftKeyboardController {
		private final AccessibilityService mService;
		@@ -1354,7 +1354,7 @@ public abstract class AccessibilityService extends Service {
		*
		* @see AccessibilityService#SHOW_MODE_AUTO
		* @see AccessibilityService#SHOW_MODE_HIDDEN
		* @see AccessibilityService#SHOW_MODE_WITH_HARD_KEYBOARD
		* @see AccessibilityService#SHOW_MODE_IGNORE_HARD_KEYBOARD
		*/
		@SoftKeyboardShowMode
		public int getShowMode() {
		@@ -1384,7 +1384,7 @@ public abstract class AccessibilityService extends Service {
		*
		* @see AccessibilityService#SHOW_MODE_AUTO
		* @see AccessibilityService#SHOW_MODE_HIDDEN
		* @see AccessibilityService#SHOW_MODE_WITH_HARD_KEYBOARD
		* @see AccessibilityService#SHOW_MODE_IGNORE_HARD_KEYBOARD
		*/
		public boolean setShowMode(@SoftKeyboardShowMode int showMode) {
		final IAccessibilityServiceConnection connection =

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import static com.android.internal.util.FunctionalUtils.ignoreRemoteException;
		import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;
		import static android.accessibilityservice.AccessibilityService.SHOW_MODE_AUTO;
		import static android.accessibilityservice.AccessibilityService.SHOW_MODE_HIDDEN;
		import static android.accessibilityservice.AccessibilityService.SHOW_MODE_WITH_HARD_KEYBOARD;
		import static android.accessibilityservice.AccessibilityService.SHOW_MODE_IGNORE_HARD_KEYBOARD;
		import static android.accessibilityservice.AccessibilityService.SHOW_MODE_HARD_KEYBOARD_ORIGINAL_VALUE;
		import static android.accessibilityservice.AccessibilityService.SHOW_MODE_HARD_KEYBOARD_OVERRIDDEN;

		@@ -3796,14 +3796,14 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
		*/
		public boolean setSoftKeyboardModeLocked(int newMode, @Nullable ComponentName requester) {
		if ((newMode != SHOW_MODE_AUTO) && (newMode != SHOW_MODE_HIDDEN)
		&& (newMode != SHOW_MODE_WITH_HARD_KEYBOARD))
		&& (newMode != SHOW_MODE_IGNORE_HARD_KEYBOARD))
		{
		Slog.w(LOG_TAG, "Invalid soft keyboard mode");
		return false;
		}
		if (mSoftKeyboardShowMode == newMode) return true;

		if (newMode == SHOW_MODE_WITH_HARD_KEYBOARD) {
		if (newMode == SHOW_MODE_IGNORE_HARD_KEYBOARD) {
		if (hasUserOverriddenHardKeyboardSettingLocked()) {
		// The user has specified a default for this setting
		return false;
		@@ -3811,13 +3811,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
		// Save the original value. But don't do this if the value in settings is already
		// the new mode. That happens when we start up after a reboot, and we don't want
		// to overwrite the value we had from when we first started controlling the setting.
		if (getSoftKeyboardValueFromSettings() != SHOW_MODE_WITH_HARD_KEYBOARD) {
		if (getSoftKeyboardValueFromSettings() != SHOW_MODE_IGNORE_HARD_KEYBOARD) {
		setOriginalHardKeyboardValue(
		Settings.Secure.getInt(mContext.getContentResolver(),
		Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0) != 0);
		}
		putSecureIntForUser(Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 1, mUserId);
		} else if (mSoftKeyboardShowMode == SHOW_MODE_WITH_HARD_KEYBOARD) {
		} else if (mSoftKeyboardShowMode == SHOW_MODE_IGNORE_HARD_KEYBOARD) {
		putSecureIntForUser(Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD,
		getOriginalHardKeyboardValue() ? 1 : 0, mUserId);
		}
		@@ -3837,7 +3837,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
		final ContentResolver cr = mContext.getContentResolver();
		final boolean showWithHardKeyboardSettings =
		Settings.Secure.getInt(cr, Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0) != 0;
		if (mSoftKeyboardShowMode == SHOW_MODE_WITH_HARD_KEYBOARD) {
		if (mSoftKeyboardShowMode == SHOW_MODE_IGNORE_HARD_KEYBOARD) {
		if (!showWithHardKeyboardSettings) {
		// The user has overridden the setting. Respect that and prevent further changes
		// to this behavior.