Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Flag guard modifier key remapping"

Browse Source
This commit is contained in:
Vaibhav Devmurari
2023-01-10 00:28:20 +00:00
committed by Android (Google) Code Review
parent 28af25a40e 4b033b4b42
commit 663a078ae8
2 changed files with 83 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/input/KeyRemapper.java
View File

@@ -21,6 +21,8 @@ import android.hardware.input.InputManager;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.util.ArrayMap;
import android.util.FeatureFlagUtils;
import android.view.InputDevice;
import com.android.internal.annotations.GuardedBy;
@@ -65,16 +67,25 @@ final class KeyRemapper implements InputManager.InputDeviceListener {
}
public void remapKey(int fromKey, int toKey) {
if (!supportRemapping()) {
return;
}
Message msg = Message.obtain(mHandler, MSG_REMAP_KEY, fromKey, toKey);
mHandler.sendMessage(msg);
}
public void clearAllKeyRemappings() {
if (!supportRemapping()) {
return;
}
Message msg = Message.obtain(mHandler, MSG_CLEAR_ALL_REMAPPING);
mHandler.sendMessage(msg);
}
public Map<Integer, Integer> getKeyRemapping() {
if (!supportRemapping()) {
return new ArrayMap<>();
}
synchronized (mDataStore) {
return mDataStore.getKeyRemapping();
}
@@ -124,6 +135,9 @@ final class KeyRemapper implements InputManager.InputDeviceListener {
@Override
public void onInputDeviceAdded(int deviceId) {
if (!supportRemapping()) {
return;
}
InputManager inputManager = Objects.requireNonNull(
mContext.getSystemService(InputManager.class));
InputDevice inputDevice = inputManager.getInputDevice(deviceId);
@@ -158,4 +172,9 @@ final class KeyRemapper implements InputManager.InputDeviceListener {
}
return false;
}
private boolean supportRemapping() {
return FeatureFlagUtils.isEnabled(mContext,
FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_MODIFIER_KEY);
}
}

90
services/tests/servicestests/src/com/android/server/input/KeyRemapperTests.kt
View File

@@ -22,6 +22,7 @@ import android.hardware.input.IInputManager
import android.hardware.input.InputManager
import android.os.test.TestLooper
import android.platform.test.annotations.Presubmit
import android.provider.Settings
import android.view.InputDevice
import android.view.KeyEvent
import androidx.test.core.app.ApplicationProvider
@@ -113,38 +114,75 @@ class KeyRemapperTests {
}
@Test
fun testKeyRemapping() {
val keyboard = createKeyboard(DEVICE_ID)
Mockito.`when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboard)
fun testKeyRemapping_whenRemappingEnabled() {
ModifierRemappingFlag(true).use {
val keyboard = createKeyboard(DEVICE_ID)
Mockito.`when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboard)
for (i in REMAPPABLE_KEYS.indices) {
val fromKeyCode = REMAPPABLE_KEYS[i]
val toKeyCode = REMAPPABLE_KEYS[(i + 1) % REMAPPABLE_KEYS.size]
mKeyRemapper.remapKey(fromKeyCode, toKeyCode)
for (i in REMAPPABLE_KEYS.indices) {
val fromKeyCode = REMAPPABLE_KEYS[i]
val toKeyCode = REMAPPABLE_KEYS[(i + 1) % REMAPPABLE_KEYS.size]
mKeyRemapper.remapKey(fromKeyCode, toKeyCode)
testLooper.dispatchNext()
}
val remapping = mKeyRemapper.keyRemapping
val expectedSize = REMAPPABLE_KEYS.size
assertEquals("Remapping size should be $expectedSize", expectedSize, remapping.size)
for (i in REMAPPABLE_KEYS.indices) {
val fromKeyCode = REMAPPABLE_KEYS[i]
val toKeyCode = REMAPPABLE_KEYS[(i + 1) % REMAPPABLE_KEYS.size]
assertEquals(
"Remapping should include mapping from $fromKeyCode to $toKeyCode",
toKeyCode,
remapping.getOrDefault(fromKeyCode, -1)
)
}
mKeyRemapper.clearAllKeyRemappings()
testLooper.dispatchNext()
}
val remapping = mKeyRemapper.keyRemapping
val expectedSize = REMAPPABLE_KEYS.size
assertEquals("Remapping size should be $expectedSize", expectedSize, remapping.size)
for (i in REMAPPABLE_KEYS.indices) {
val fromKeyCode = REMAPPABLE_KEYS[i]
val toKeyCode = REMAPPABLE_KEYS[(i + 1) % REMAPPABLE_KEYS.size]
assertEquals(
"Remapping should include mapping from $fromKeyCode to $toKeyCode",
toKeyCode,
remapping.getOrDefault(fromKeyCode, -1)
"Remapping size should be 0 after clearAllModifierKeyRemappings",
0,
mKeyRemapper.keyRemapping.size
)
}
}
@Test
fun testKeyRemapping_whenRemappingDisabled() {
ModifierRemappingFlag(false).use {
val keyboard = createKeyboard(DEVICE_ID)
Mockito.`when`(iInputManager.getInputDevice(DEVICE_ID)).thenReturn(keyboard)
mKeyRemapper.remapKey(REMAPPABLE_KEYS[0], REMAPPABLE_KEYS[1])
testLooper.dispatchAll()
val remapping = mKeyRemapper.keyRemapping
assertEquals(
"Remapping should not be done if modifier key remapping is disabled",
0,
remapping.size
)
}
}
private inner class ModifierRemappingFlag constructor(enabled: Boolean) : AutoCloseable {
init {
Settings.Global.putString(
context.contentResolver,
"settings_new_keyboard_modifier_key", enabled.toString()
)
}
mKeyRemapper.clearAllKeyRemappings()
testLooper.dispatchNext()
assertEquals(
"Remapping size should be 0 after clearAllModifierKeyRemappings",
0,
mKeyRemapper.keyRemapping.size
)
override fun close() {
Settings.Global.putString(
context.contentResolver,
"settings_new_keyboard_modifier_key",
""
)
}
}
}