PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: I12332396bed68d97d711926f8d3dc076864ca1d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-04 04:00:30 +00:00
committed by Automerger Merge Worker
parent ec574d6fe5 e71643efac
commit b3d65a57af
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
View File

@@ -32,6 +32,7 @@ import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.hardware.input.InputManager; import android.hardware.input.InputManager;
import android.os.UserManager; import android.os.UserManager;
import android.util.FeatureFlagUtils;
import android.view.autofill.AutofillManager; import android.view.autofill.AutofillManager;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.view.textservice.TextServicesManager; import android.view.textservice.TextServicesManager;
@@ -119,6 +120,7 @@ public class LanguageAndInputSettingsTest {
final Resources res = spy(RuntimeEnvironment.application.getResources()); final Resources res = spy(RuntimeEnvironment.application.getResources());
final InputManager inputManager = mock(InputManager.class); final InputManager inputManager = mock(InputManager.class);
final TextServicesManager textServicesManager = mock(TextServicesManager.class); final TextServicesManager textServicesManager = mock(TextServicesManager.class);
FeatureFlagUtils.setEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_UI, false);
when(inputManager.getInputDeviceIds()).thenReturn(new int[0]); when(inputManager.getInputDeviceIds()).thenReturn(new int[0]);
doReturn(inputManager).when(context).getSystemService(Context.INPUT_SERVICE); doReturn(inputManager).when(context).getSystemService(Context.INPUT_SERVICE);
doReturn(textServicesManager).when(context) doReturn(textServicesManager).when(context)