am d0fd5464: Merge "Adding UI test automation APIs." (98401986) · Commits · e / os / android_frameworks_base

Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ LOCAL_SRC_FILES += \
		core/java/android/app/IThumbnailReceiver.aidl \
		core/java/android/app/IThumbnailRetriever.aidl \
		core/java/android/app/ITransientNotification.aidl \
		core/java/android/app/IUiAutomationConnection.aidl \
		core/java/android/app/IUiModeManager.aidl \
		core/java/android/app/IUserSwitchObserver.aidl \
		core/java/android/app/IWallpaperManager.aidl \

api/current.txt

+26 −0

Original line number	Diff line number	Diff line
		@@ -2104,6 +2104,7 @@ package android.accessibilityservice {
		field public static final int FEEDBACK_SPOKEN = 1; // 0x1
		field public static final int FEEDBACK_VISUAL = 8; // 0x8
		field public static final int FLAG_INCLUDE_NOT_IMPORTANT_VIEWS = 2; // 0x2
		field public static final int FLAG_REPORT_VIEW_IDS = 8; // 0x8
		field public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE = 4; // 0x4
		field public int eventTypes;
		field public int feedbackType;
		@@ -3587,6 +3588,7 @@ package android.app {
		method public android.content.ComponentName getComponentName();
		method public android.content.Context getContext();
		method public android.content.Context getTargetContext();
		method public android.app.UiAutomation getUiAutomation();
		method public boolean invokeContextMenuAction(android.app.Activity, int, int);
		method public boolean invokeMenuActionSync(android.app.Activity, int, int);
		method public boolean isProfiling();
		@@ -4144,6 +4146,26 @@ package android.app {
		method public abstract void onTimeSet(android.widget.TimePicker, int, int);
		}

		public final class UiAutomation {
		method public android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(java.lang.Runnable, com.android.internal.util.Predicate<android.view.accessibility.AccessibilityEvent>, long) throws java.util.concurrent.TimeoutException;
		method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();
		method public boolean injectInputEvent(android.view.InputEvent, boolean);
		method public void setOnAccessibilityEventListener(android.app.UiAutomation.OnAccessibilityEventListener);
		method public boolean setRotation(int);
		method public android.graphics.Bitmap takeScreenshot();
		method public void waitForIdle(long, long) throws java.util.concurrent.TimeoutException;
		field public static final int ROTATION_FREEZE_0 = 0; // 0x0
		field public static final int ROTATION_FREEZE_180 = 2; // 0x2
		field public static final int ROTATION_FREEZE_270 = 3; // 0x3
		field public static final int ROTATION_FREEZE_90 = 1; // 0x1
		field public static final int ROTATION_FREEZE_CURRENT = -1; // 0xffffffff
		field public static final int ROTATION_UNFREEZE = -2; // 0xfffffffe
		}

		public static abstract interface UiAutomation.OnAccessibilityEventListener {
		method public abstract void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
		}

		public class UiModeManager {
		method public void disableCarMode(int);
		method public void enableCarMode(int);
		@@ -21308,6 +21330,7 @@ package android.test {
		ctor public InstrumentationTestRunner();
		method public junit.framework.TestSuite getAllTests();
		method protected android.test.AndroidTestRunner getAndroidTestRunner();
		method protected android.os.Bundle getArguments();
		method public java.lang.ClassLoader getLoader();
		method public junit.framework.TestSuite getTestSuite();
		field public static final java.lang.String REPORT_KEY_NAME_CLASS = "class";
		@@ -26254,6 +26277,7 @@ package android.view.accessibility {
		method public void addChild(android.view.View, int);
		method public int describeContents();
		method public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByText(java.lang.String);
		method public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByViewId(java.lang.String);
		method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
		method public android.view.accessibility.AccessibilityNodeInfo focusSearch(int);
		method public int getActions();
		@@ -26269,6 +26293,7 @@ package android.view.accessibility {
		method public java.lang.CharSequence getPackageName();
		method public android.view.accessibility.AccessibilityNodeInfo getParent();
		method public java.lang.CharSequence getText();
		method public java.lang.CharSequence getViewId();
		method public int getWindowId();
		method public boolean isAccessibilityFocused();
		method public boolean isCheckable();
		@@ -26316,6 +26341,7 @@ package android.view.accessibility {
		method public void setSource(android.view.View);
		method public void setSource(android.view.View, int);
		method public void setText(java.lang.CharSequence);
		method public void setViewId(java.lang.CharSequence);
		method public void setVisibleToUser(boolean);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int ACTION_ACCESSIBILITY_FOCUS = 64; // 0x40

cmds/am/src/com/android/commands/am/Am.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.app.IActivityController;
		import android.app.IActivityManager;
		import android.app.IInstrumentationWatcher;
		import android.app.Instrumentation;
		import android.app.UiAutomationConnection;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.IIntentReceiver;
		@@ -661,10 +662,13 @@ public class Am {
		if (cn == null) throw new IllegalArgumentException("Bad component name: " + cnArg);

		InstrumentationWatcher watcher = null;
		UiAutomationConnection connection = null;
		if (wait) {
		watcher = new InstrumentationWatcher();
		watcher.setRawOutput(rawMode);
		connection = new UiAutomationConnection();
		}

		float[] oldAnims = null;
		if (no_window_animation) {
		oldAnims = wm.getAnimationScales();
		@@ -672,7 +676,7 @@ public class Am {
		wm.setAnimationScale(1, 0.0f);
		}

		if (!mAm.startInstrumentation(cn, profileFile, 0, args, watcher, userId)) {
		if (!mAm.startInstrumentation(cn, profileFile, 0, args, watcher, connection, userId)) {
		throw new AndroidException("INSTRUMENTATION_FAILED: " + cn.flattenToString());
		}

core/java/android/accessibilityservice/AccessibilityService.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -339,7 +339,10 @@ public abstract class AccessibilityService extends Service {

		private static final String LOG_TAG = "AccessibilityService";

		interface Callbacks {
		/**
		* @hide
		*/
		public interface Callbacks {
		public void onAccessibilityEvent(AccessibilityEvent event);
		public void onInterrupt();
		public void onServiceConnected();
		@@ -538,8 +541,10 @@ public abstract class AccessibilityService extends Service {
		/**
		* Implements the internal {@link IAccessibilityServiceClient} interface to convert
		* incoming calls to it back to calls on an {@link AccessibilityService}.
		*
		* @hide
		*/
		static class IAccessibilityServiceClientWrapper extends IAccessibilityServiceClient.Stub
		public static class IAccessibilityServiceClientWrapper extends IAccessibilityServiceClient.Stub
		implements HandlerCaller.Callback {

		static final int NO_ID = -1;

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.util.TypedValue;
		import android.util.Xml;
		import android.view.View;
		import android.view.accessibility.AccessibilityEvent;
		import android.view.accessibility.AccessibilityNodeInfo;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;
		@@ -151,6 +152,15 @@ public class AccessibilityServiceInfo implements Parcelable {
		*/
		public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE= 0x0000004;

		/**
		* This flag requests that the {@link AccessibilityNodeInfo}s obtained
		* by an {@link AccessibilityService} contain the id of the source view.
		* The source view id will be a fully qualified resource name of the
		* form "package:id/name", for example "foo.bar:id/my_list", and it is
		* useful for UI test automation. This flag is not set by default.
		*/
		public static final int FLAG_REPORT_VIEW_IDS = 0x00000008;

		/**
		* The event types an {@link AccessibilityService} is interested in.
		* <p>