From bd2d0de0b3c81c6621d99ed6215734a9e8df2d99 Mon Sep 17 00:00:00 2001 From: danielwbhuang Date: Wed, 3 May 2023 20:40:53 +0800 Subject: [PATCH] Fix testNonIndexableKeys_existInXmlLayout This test is for LanguageAndInputSettings UI. Hence, we should set flag "SETTINGS_NEW_KEYBOARD_UI" to false Bug: 280018738 Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=LanguageAndInputSettingsTest Change-Id: Ida91a23bb576c81f9618406d54c1d892b23eb4fa --- .../android/settings/language/LanguageAndInputSettingsTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java index 5a92aa29516..4429dd764df 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -32,6 +32,7 @@ import android.content.Context; import android.content.res.Resources; import android.hardware.input.InputManager; import android.os.UserManager; +import android.util.FeatureFlagUtils; import android.view.autofill.AutofillManager; import android.view.inputmethod.InputMethodManager; import android.view.textservice.TextServicesManager; @@ -119,6 +120,7 @@ public class LanguageAndInputSettingsTest { final Resources res = spy(RuntimeEnvironment.application.getResources()); final InputManager inputManager = mock(InputManager.class); final TextServicesManager textServicesManager = mock(TextServicesManager.class); + FeatureFlagUtils.setEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_UI, false); when(inputManager.getInputDeviceIds()).thenReturn(new int[0]); doReturn(inputManager).when(context).getSystemService(Context.INPUT_SERVICE); doReturn(textServicesManager).when(context)