Merge "Handle custom key gestures added by the user" into main (9b176a95) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/input/InputGestureManager.java

+24 −0

Original line number	Diff line number	Diff line
		@@ -17,10 +17,13 @@
		package com.android.server.input;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.UserIdInt;
		import android.hardware.input.InputGestureData;
		import android.hardware.input.InputManager;
		import android.util.IndentingPrintWriter;
		import android.util.SparseArray;
		import android.view.KeyEvent;

		import com.android.internal.annotations.GuardedBy;

		@@ -40,6 +43,10 @@ import java.util.Objects;
		final class InputGestureManager {
		private static final String TAG = "InputGestureManager";

		private static final int KEY_GESTURE_META_MASK =
		KeyEvent.META_CTRL_ON \| KeyEvent.META_ALT_ON \| KeyEvent.META_SHIFT_ON
		\| KeyEvent.META_META_ON;

		@GuardedBy("mCustomInputGestures")
		private final SparseArray<Map<InputGestureData.Trigger, InputGestureData>>
		mCustomInputGestures = new SparseArray<>();
		@@ -96,6 +103,23 @@ final class InputGestureManager {
		}
		}

		@Nullable
		public InputGestureData getCustomGestureForKeyEvent(@UserIdInt int userId, KeyEvent event) {
		final int keyCode = event.getKeyCode();
		if (keyCode == KeyEvent.KEYCODE_UNKNOWN) {
		return null;
		}
		synchronized (mCustomInputGestures) {
		Map<InputGestureData.Trigger, InputGestureData> customGestures =
		mCustomInputGestures.get(userId);
		if (customGestures == null) {
		return null;
		}
		int modifierState = event.getMetaState() & KEY_GESTURE_META_MASK;
		return customGestures.get(InputGestureData.createKeyTrigger(keyCode, modifierState));
		}
		}

		public void dump(IndentingPrintWriter ipw) {
		ipw.println("InputGestureManager:");
		ipw.increaseIndent();

services/core/java/com/android/server/input/InputManagerService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -3022,6 +3022,7 @@ public class InputManagerService extends IInputManager.Stub

		private void handleCurrentUserChanged(@UserIdInt int userId) {
		mCurrentUserId = userId;
		mKeyGestureController.setCurrentUserId(userId);
		}

		/**