Fix tests

tests/src/org/futo/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java

@@ -37,6 +37,7 @@ import org.futo.inputmethod.latin.utils.AdditionalSubtypeUtils;
 import org.futo.inputmethod.latin.utils.ResourceUtils;
 import org.futo.inputmethod.v2keyboard.KeyboardLayoutSetV2;
 import org.futo.inputmethod.v2keyboard.KeyboardLayoutSetV2Params;
+import org.futo.inputmethod.v2keyboard.RegularKeyboardSize;
 
 import java.util.ArrayList;
 import java.util.Locale;
@@ -151,11 +152,11 @@ public abstract class KeyboardLayoutSetTestsBase extends AndroidTestCase {
         return new KeyboardLayoutSetV2(
                 context,
                 new KeyboardLayoutSetV2Params(
-                        keyboardWidth, keyboardHeight, new Rect(),
+                        new RegularKeyboardSize(keyboardHeight, keyboardWidth, new Rect()),
                         richInputMethodSubtype.getKeyboardLayoutSetName(),
                         richInputMethodSubtype.getLocale(),
-                        editorInfo, false,
-                        4.0f, splitLayoutEnabled, 0,
+                        editorInfo, false, false,
+                        4.0f,
                         languageSwitchKeyEnabled ? ActionRegistry.INSTANCE.actionStringIdToIdx("switch_language") : null,
                         LongPressKeySettings.forTest()
                 )

tests/src/org/futo/inputmethod/keyboard/internal/KeyboardLayoutSetV2Tests.kt

@@ -9,20 +9,18 @@ import org.futo.inputmethod.latin.uix.KeyboardHeightMultiplierSetting
 import org.futo.inputmethod.latin.uix.dataStore
 import org.futo.inputmethod.v2keyboard.KeyboardLayoutSetV2
 import org.futo.inputmethod.v2keyboard.KeyboardLayoutSetV2Params
+import org.futo.inputmethod.v2keyboard.RegularKeyboardSize
 import java.util.Locale
 import kotlin.math.absoluteValue
 
 class KeyboardLayoutSetV2Tests : AndroidTestCase() {
     private val layoutParams = KeyboardLayoutSetV2Params(
-        width = 1024,
-        height = 1024,
-        padding = Rect(),
+        computedSize = RegularKeyboardSize(1024, 1024, Rect()),
         keyboardLayoutSet = "qwerty",
         locale = Locale.ENGLISH,
         editorInfo = EditorInfo(),
         numberRow = false,
-        useSplitLayout = false,
-        splitLayoutWidth = 0,
+        arrowRow = false,
         bottomActionKey = null
     )