From 6e634c03c624860ba7afed6df3673d4c276bd5e6 Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Thu, 30 Jul 2020 17:24:50 -0700 Subject: [PATCH] address use of DummyIME in UI Automator See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: compile (code is not active in use) Change-Id: Ice71490ff09969f229943d6ef952a09f4e283d14 Merged-In: Ice71490ff09969f229943d6ef952a09f4e283d14 --- .../uiautomator/core/UiAutomationShellWrapper.java | 6 +++--- .../uiautomator/testrunner/UiAutomatorTestCase.java | 10 +++++----- tests/utils/{DummyIME => StubIME}/Android.bp | 2 +- tests/utils/{DummyIME => StubIME}/AndroidManifest.xml | 8 ++++---- tests/utils/{DummyIME => StubIME}/res/xml/method.xml | 4 ++-- .../com/android/testing/stubime}/ImePreferences.java | 4 ++-- .../src/com/android/testing/stubime/StubIme.java} | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) rename tests/utils/{DummyIME => StubIME}/Android.bp (96%) rename tests/utils/{DummyIME => StubIME}/AndroidManifest.xml (88%) rename tests/utils/{DummyIME => StubIME}/res/xml/method.xml (91%) rename tests/utils/{DummyIME/src/com/android/testing/dummyime => StubIME/src/com/android/testing/stubime}/ImePreferences.java (91%) rename tests/utils/{DummyIME/src/com/android/testing/dummyime/DummyIme.java => StubIME/src/com/android/testing/stubime/StubIme.java} (85%) diff --git a/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/UiAutomationShellWrapper.java b/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/UiAutomationShellWrapper.java index 71561c3c7023d..39248730802f5 100644 --- a/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/UiAutomationShellWrapper.java +++ b/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/UiAutomationShellWrapper.java @@ -49,7 +49,7 @@ public class UiAutomationShellWrapper { } try { if (isSet) { - am.setActivityController(new DummyActivityController(), true); + am.setActivityController(new NoOpActivityController(), true); } else { am.setActivityController(null, true); } @@ -80,9 +80,9 @@ public class UiAutomationShellWrapper { } /** - * Dummy, no interference, activity controller. + * No-op, no interference, activity controller. */ - private class DummyActivityController extends IActivityController.Stub { + private class NoOpActivityController extends IActivityController.Stub { @Override public boolean activityStarting(Intent intent, String pkg) throws RemoteException { /* do nothing and let activity proceed normally */ diff --git a/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/testrunner/UiAutomatorTestCase.java b/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/testrunner/UiAutomatorTestCase.java index d862e1c2babba..e6fb7aa76e585 100644 --- a/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/testrunner/UiAutomatorTestCase.java +++ b/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/testrunner/UiAutomatorTestCase.java @@ -45,7 +45,7 @@ import java.util.List; public class UiAutomatorTestCase extends TestCase { private static final String DISABLE_IME = "disable_ime"; - private static final String DUMMY_IME_PACKAGE = "com.android.testing.dummyime"; + private static final String STUB_IME_PACKAGE = "com.android.testing.stubime"; private static final int NOT_A_SUBTYPE_ID = -1; private UiDevice mUiDevice; @@ -58,7 +58,7 @@ public class UiAutomatorTestCase extends TestCase { super.setUp(); mShouldDisableIme = "true".equals(mParams.getString(DISABLE_IME)); if (mShouldDisableIme) { - setDummyIme(); + setStubIme(); } } @@ -128,7 +128,7 @@ public class UiAutomatorTestCase extends TestCase { SystemClock.sleep(ms); } - private void setDummyIme() { + private void setStubIme() { Context context = ActivityThread.currentApplication(); if (context == null) { throw new RuntimeException("ActivityThread.currentApplication() is null."); @@ -138,13 +138,13 @@ public class UiAutomatorTestCase extends TestCase { List infos = im.getInputMethodList(); String id = null; for (InputMethodInfo info : infos) { - if (DUMMY_IME_PACKAGE.equals(info.getComponent().getPackageName())) { + if (STUB_IME_PACKAGE.equals(info.getComponent().getPackageName())) { id = info.getId(); } } if (id == null) { throw new RuntimeException(String.format( - "Required testing fixture missing: IME package (%s)", DUMMY_IME_PACKAGE)); + "Required testing fixture missing: IME package (%s)", STUB_IME_PACKAGE)); } if (context.checkSelfPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) != PackageManager.PERMISSION_GRANTED) { diff --git a/tests/utils/DummyIME/Android.bp b/tests/utils/StubIME/Android.bp similarity index 96% rename from tests/utils/DummyIME/Android.bp rename to tests/utils/StubIME/Android.bp index 4a44b3b279928..668c92c86c51b 100644 --- a/tests/utils/DummyIME/Android.bp +++ b/tests/utils/StubIME/Android.bp @@ -15,7 +15,7 @@ // android_test { - name: "DummyIME", + name: "StubIME", srcs: ["src/**/*.java"], sdk_version: "current", } diff --git a/tests/utils/DummyIME/AndroidManifest.xml b/tests/utils/StubIME/AndroidManifest.xml similarity index 88% rename from tests/utils/DummyIME/AndroidManifest.xml rename to tests/utils/StubIME/AndroidManifest.xml index fd17a52cb7d9f..04502d331d6ab 100644 --- a/tests/utils/DummyIME/AndroidManifest.xml +++ b/tests/utils/StubIME/AndroidManifest.xml @@ -17,16 +17,16 @@ --> - - + + - + diff --git a/tests/utils/DummyIME/res/xml/method.xml b/tests/utils/StubIME/res/xml/method.xml similarity index 91% rename from tests/utils/DummyIME/res/xml/method.xml rename to tests/utils/StubIME/res/xml/method.xml index 43a330e2bc937..1bb4bcd3480bd 100644 --- a/tests/utils/DummyIME/res/xml/method.xml +++ b/tests/utils/StubIME/res/xml/method.xml @@ -21,9 +21,9 @@ + android:settingsActivity="com.android.testing.stubime.ImePreferences"> - \ No newline at end of file + diff --git a/tests/utils/DummyIME/src/com/android/testing/dummyime/ImePreferences.java b/tests/utils/StubIME/src/com/android/testing/stubime/ImePreferences.java similarity index 91% rename from tests/utils/DummyIME/src/com/android/testing/dummyime/ImePreferences.java rename to tests/utils/StubIME/src/com/android/testing/stubime/ImePreferences.java index 41036ab865966..b77525ad0a43c 100644 --- a/tests/utils/DummyIME/src/com/android/testing/dummyime/ImePreferences.java +++ b/tests/utils/StubIME/src/com/android/testing/stubime/ImePreferences.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.testing.dummyime; +package com.android.testing.stubime; import android.preference.PreferenceActivity; /** - * Dummy IME preference activity + * Stub IME preference activity */ public class ImePreferences extends PreferenceActivity { diff --git a/tests/utils/DummyIME/src/com/android/testing/dummyime/DummyIme.java b/tests/utils/StubIME/src/com/android/testing/stubime/StubIme.java similarity index 85% rename from tests/utils/DummyIME/src/com/android/testing/dummyime/DummyIme.java rename to tests/utils/StubIME/src/com/android/testing/stubime/StubIme.java index 7b7a39a702e50..8795202b3283c 100644 --- a/tests/utils/DummyIME/src/com/android/testing/dummyime/DummyIme.java +++ b/tests/utils/StubIME/src/com/android/testing/stubime/StubIme.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.testing.dummyime; +package com.android.testing.stubime; import android.inputmethodservice.InputMethodService; /** - * Dummy IME implementation that basically does nothing + * Stub IME implementation that basically does nothing */ -public class DummyIme extends InputMethodService { +public class StubIme extends InputMethodService { @Override public boolean onEvaluateFullscreenMode() {