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

Merge "Fix KeyboardLayoutTest when new_settings flag is on" into udc-dev am: 370a76b2a2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21521191

Change-Id: Id30fd25df2bc54edcf3dbe6d6d60ab72adeac4eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vaibhav Devmurari
2023-03-06 12:06:57 +00:00
committed by Automerger Merge Worker
parent 509badcfa7 370a76b2a2
commit 2bc82bbf71
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/input/KeyboardLayoutManager.java
View File

@@ -283,7 +283,8 @@ final class KeyboardLayoutManager implements InputManager.InputDeviceListener {
public KeyboardLayout[] getKeyboardLayoutsForInputDevice( public KeyboardLayout[] getKeyboardLayoutsForInputDevice(
final InputDeviceIdentifier identifier) { final InputDeviceIdentifier identifier) {
if (useNewSettingsUi()) { if (useNewSettingsUi()) {
return new KeyboardLayout[0]; // Provide all supported keyboard layouts since Ime info is not provided
return getKeyboardLayouts();
} }
final String[] enabledLayoutDescriptors = final String[] enabledLayoutDescriptors =
getEnabledKeyboardLayoutsForInputDevice(identifier); getEnabledKeyboardLayoutsForInputDevice(identifier);

12
services/tests/servicestests/src/com/android/server/input/KeyboardLayoutManagerTests.kt
View File

@@ -256,13 +256,17 @@ class KeyboardLayoutManagerTests {
@Test @Test
fun testNewUi_getKeyboardLayoutsForInputDevice() { fun testNewUi_getKeyboardLayoutsForInputDevice() {
NewSettingsApiFlag(true).use { NewSettingsApiFlag(true).use {
val keyboardLayouts = val keyboardLayouts = keyboardLayoutManager.keyboardLayouts
keyboardLayoutManager.getKeyboardLayoutsForInputDevice(keyboardDevice.identifier) assertNotEquals(
assertEquals( "New UI: getKeyboardLayoutsForInputDevice API should not return empty array",
"New UI: getKeyboardLayoutsForInputDevice API should always return empty array",
0, 0,
keyboardLayouts.size keyboardLayouts.size
) )
assertTrue(
"New UI: getKeyboardLayoutsForInputDevice API should provide English(US) " +
"layout",
hasLayout(keyboardLayouts, ENGLISH_US_LAYOUT_DESCRIPTOR)
)
} }
} }