diff --git a/projects.conf b/projects.conf
index 406630265..f9b14cdb2 100644
--- a/projects.conf
+++ b/projects.conf
@@ -5,6 +5,7 @@ ui/espresso/AccessibilitySample
ui/espresso/BasicSample
ui/espresso/CustomMatcherSample
ui/espresso/DataAdapterSample
+ui/espresso/EspressoDeviceSample
ui/espresso/FragmentScenarioSample
ui/espresso/IdlingResourceSample
ui/espresso/IntentsAdvancedSample
@@ -15,4 +16,4 @@ ui/espresso/RecyclerViewSample
ui/espresso/ScreenshotSample
ui/espresso/WebBasicSample
ui/uiautomator/BasicSample
-unit/BasicNativeAndroidTest
\ No newline at end of file
+unit/BasicNativeAndroidTest
diff --git a/ui/espresso/EspressoDeviceSample/.gitignore b/ui/espresso/EspressoDeviceSample/.gitignore
new file mode 100644
index 000000000..1406630a7
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/.gitignore
@@ -0,0 +1,6 @@
+.gradle
+local.properties
+.idea
+.DS_Store
+build
+*.iml
diff --git a/ui/espresso/EspressoDeviceSample/BUILD.bazel b/ui/espresso/EspressoDeviceSample/BUILD.bazel
new file mode 100644
index 000000000..1cf22e43f
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/BUILD.bazel
@@ -0,0 +1,58 @@
+licenses(["notice"]) # Apache 2.0
+
+load("//:common_defs.bzl", "minSdkVersion", "targetSdkVersion")
+load("@rules_jvm_external//:defs.bzl", "artifact")
+
+android_library(
+ name = "EspressoDeviceSampleLib",
+ srcs = glob(["app/src/main/**/*.java"]),
+ custom_package = "com.example.android.testing.espresso.EspressoDeviceSample",
+ manifest = "app/src/main/AndroidManifest.xml",
+ resource_files = glob(["app/src/main/res/**/*"]),
+)
+
+android_binary(
+ name = "EspressoDeviceSample",
+ custom_package = "com.example.android.testing.espresso.EspressoDeviceSample",
+ manifest = "app/src/main/AppManifest.xml",
+ manifest_values = {
+ "minSdkVersion": minSdkVersion,
+ "targetSdkVersion": targetSdkVersion,
+ },
+ deps = [":EspressoDeviceSampleLib"],
+)
+
+android_library(
+ name = "EspressoDeviceSampleTestLib",
+ srcs = glob(["app/src/androidTest/**/*.java"]),
+ custom_package = "com.example.android.testing.espresso.EspressoDeviceSample.test",
+ deps = [
+ ":EspressoDeviceSampleLib",
+ "//:test_deps",
+ ],
+)
+
+android_binary(
+ name = "EspressoDeviceSampleTest",
+ custom_package = "com.example.android.testing.espresso.EspressoDeviceSample.test",
+ instruments = ":EspressoDeviceSample",
+ manifest = "app/src/androidTest/AndroidManifest.xml",
+ manifest_values = {
+ "minSdkVersion": minSdkVersion,
+ "targetSdkVersion": targetSdkVersion,
+ },
+ deps = [":EspressoDeviceSampleTestLib"],
+)
+
+API_LEVELS = [
+ "19_x86",
+ "21_x86",
+ "22_x86",
+ "23_x86",
+]
+
+[android_instrumentation_test(
+ name = "EspressoDeviceSampleInstrumentationTest_%s" % API_LEVEL,
+ target_device = "@android_test_support//tools/android/emulated_devices/generic_phone:android_%s_qemu2" % API_LEVEL,
+ test_app = ":EspressoDeviceSampleTest",
+) for API_LEVEL in API_LEVELS]
diff --git a/ui/espresso/EspressoDeviceSample/README.md b/ui/espresso/EspressoDeviceSample/README.md
new file mode 100644
index 000000000..4be8ed983
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/README.md
@@ -0,0 +1,25 @@
+# Basic sample for Espresso Device
+
+The Espresso Device API enables synchronized interactions with the test device. This API is experimental and subject to change. Currently, it is only supported on instrumentation tests run on emulators.
+
+To skip tests on devices that do not have certain display attributes, such as display width and height, annotate your test with @RequiresDisplay. This annotation takes in a WidthSizeClassEnum and a HeightSizeClassEnum. It can be applied to test classes or test methods. For details on these size classes, see https://developer.android.com/guide/topics/large-screens/support-different-screen-sizes.
+
+This project uses the Gradle build system. You don't need an IDE to build and execute it but Android Studio 3.4 is recommended.
+
+1. Download the project code, preferably using `git clone`.
+1. In Android Studio, select *File* | *Open...* and point to the `./build.gradle` file.
+1. Check out the relevant code:
+ * The application under test is located in `src/main/java`
+ * Instrumentation Tests are in `src/androidTest/java`
+ * Local Tests are in `src/test/java`
+1. Create and run the Instrumented test configuration
+ * Open *Run* menu | *Edit Configurations*
+ * Add a new *Android Instrumented Tests* configuration
+ * Choose the `app` module
+ * Connect a device or start an emulator
+ * Turn animations off.
+ (On your device, under Settings->Developer options disable the following 3 settings: "Window animation scale", "Transition animation scale" and "Animator duration scale")
+ * Run the newly created configuration
+ * The application will be started on the device/emulator and a series of actions will be performed automatically.
+
+If you are using Android Studio, the *Run* window will show the test results.
\ No newline at end of file
diff --git a/ui/espresso/EspressoDeviceSample/app/build.gradle b/ui/espresso/EspressoDeviceSample/app/build.gradle
new file mode 100644
index 000000000..a65bca6e6
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/app/build.gradle
@@ -0,0 +1,60 @@
+apply plugin: 'com.android.application'
+
+apply plugin: 'kotlin-android'
+
+apply plugin: 'kotlin-android-extensions'
+
+android {
+ compileSdkVersion 33
+ buildToolsVersion rootProject.buildToolsVersion
+ defaultConfig {
+ applicationId "com.example.android.testing.espresso.EspressoDeviceSample"
+ minSdkVersion 14
+ targetSdkVersion 33
+ versionCode 1
+ versionName "1.0"
+
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ }
+ lintOptions {
+ abortOnError false
+ }
+ productFlavors {
+ }
+ testOptions {
+ unitTests {
+ includeAndroidResources = true
+ }
+ managedDevices {
+ devices {
+ // run with ../gradlew nexusOneApi30DebugAndroidTest
+ nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
+ // A lower resolution device is used here for better emulator performance
+ device = "Nexus One"
+ apiLevel = 30
+ // Also use the AOSP ATD image for better emulator performance
+ // The androidx.test screenshot APIs will automatically enable hardware rendering
+ // to take a screenshot
+ systemImageSource = "aosp-atd"
+ }
+ }
+ }
+ }
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
+}
+
+dependencies {
+ androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+ androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion
+ androidTestImplementation 'androidx.test.ext:junit-ktx:' + rootProject.extJUnitVersion
+ androidTestImplementation 'androidx.test.espresso:espresso-device:' + rootProject.espressoDeviceVersion
+
+ testImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion
+ testImplementation 'junit:junit:4.12'
+ testImplementation 'org.robolectric:robolectric:' + rootProject.robolectricVersion
+}
diff --git a/ui/espresso/EspressoDeviceSample/app/src/androidTest/AndroidManifest.xml b/ui/espresso/EspressoDeviceSample/app/src/androidTest/AndroidManifest.xml
new file mode 100644
index 000000000..59978599c
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/app/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
diff --git a/ui/espresso/EspressoDeviceSample/app/src/androidTest/java/com/example/android/testing/espresso/EspressoDeviceSample/RequiresDisplayTest.kt b/ui/espresso/EspressoDeviceSample/app/src/androidTest/java/com/example/android/testing/espresso/EspressoDeviceSample/RequiresDisplayTest.kt
new file mode 100644
index 000000000..6ba423979
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/app/src/androidTest/java/com/example/android/testing/espresso/EspressoDeviceSample/RequiresDisplayTest.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2022, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.example.android.testing.espresso.EspressoDeviceSample
+
+import androidx.test.espresso.device.filter.RequiresDisplay
+import androidx.test.espresso.device.sizeclass.HeightSizeClass
+import androidx.test.espresso.device.sizeclass.WidthSizeClass
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/*
+ * Illustrates usage of @RequiresDisplay API to filter tests based on display attributes such a screen size.
+ */
+@RunWith(AndroidJUnit4::class)
+class RequiresDisplayTest {
+ @RequiresDisplay(
+ widthSizeClass = WidthSizeClass.Companion.WidthSizeClassEnum.COMPACT,
+ heightSizeClass = HeightSizeClass.Companion.HeightSizeClassEnum.COMPACT
+ )
+ @Test
+ fun testOnDevicesWithCompactWidthAndHeight() {}
+
+ @RequiresDisplay(
+ widthSizeClass = WidthSizeClass.Companion.WidthSizeClassEnum.COMPACT,
+ heightSizeClass = HeightSizeClass.Companion.HeightSizeClassEnum.MEDIUM
+ )
+ @Test
+ fun testOnDevicesWithCompactWidthAndMediumHeight() {}
+
+ @RequiresDisplay(
+ widthSizeClass = WidthSizeClass.Companion.WidthSizeClassEnum.MEDIUM,
+ heightSizeClass = HeightSizeClass.Companion.HeightSizeClassEnum.COMPACT
+ )
+ @Test
+ fun testOnDevicesWithMediumWidthAndCompactHeight() {}
+
+ @RequiresDisplay(
+ widthSizeClass = WidthSizeClass.Companion.WidthSizeClassEnum.COMPACT,
+ heightSizeClass = HeightSizeClass.Companion.HeightSizeClassEnum.EXPANDED
+ )
+ @Test
+ fun testOnDevicesWithCompactWidthAndExpandedHeight() {}
+
+ @RequiresDisplay(
+ widthSizeClass = WidthSizeClass.Companion.WidthSizeClassEnum.EXPANDED,
+ heightSizeClass = HeightSizeClass.Companion.HeightSizeClassEnum.COMPACT
+ )
+ @Test
+ fun testOnDevicesWithExpandedWidthAndCompactHeight() {}
+
+ @RequiresDisplay(
+ widthSizeClass = WidthSizeClass.Companion.WidthSizeClassEnum.MEDIUM,
+ heightSizeClass = HeightSizeClass.Companion.HeightSizeClassEnum.MEDIUM
+ )
+ @Test
+ fun testOnDevicesWithMediumWidthAndHeight() {}
+
+ @RequiresDisplay(
+ widthSizeClass = WidthSizeClass.Companion.WidthSizeClassEnum.EXPANDED,
+ heightSizeClass = HeightSizeClass.Companion.HeightSizeClassEnum.MEDIUM,
+ )
+ @Test
+ fun testOnDevicesWithExpandedWidthAndMediumHeight() {}
+
+
+ @RequiresDisplay(
+ widthSizeClass = WidthSizeClass.Companion.WidthSizeClassEnum.MEDIUM,
+ heightSizeClass = HeightSizeClass.Companion.HeightSizeClassEnum.EXPANDED
+ )
+ @Test
+ fun testOnDevicesWithMediumWidthAndExpandedHeight() {}
+
+ @RequiresDisplay(
+ widthSizeClass = WidthSizeClass.Companion.WidthSizeClassEnum.EXPANDED,
+ heightSizeClass = HeightSizeClass.Companion.HeightSizeClassEnum.EXPANDED
+ )
+ @Test
+ fun testOnDevicesWithExpandedWidthAndHeight() {}
+}
\ No newline at end of file
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/AndroidManifest.xml b/ui/espresso/EspressoDeviceSample/app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..361a31168
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/app/src/main/AndroidManifest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/AppManifest.xml b/ui/espresso/EspressoDeviceSample/app/src/main/AppManifest.xml
new file mode 100644
index 000000000..a314a52af
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/app/src/main/AppManifest.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/java/com/example/android/testing/espresso/EspressoDeviceSample/MainActivity.java b/ui/espresso/EspressoDeviceSample/app/src/main/java/com/example/android/testing/espresso/EspressoDeviceSample/MainActivity.java
new file mode 100644
index 000000000..99710b8ba
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/app/src/main/java/com/example/android/testing/espresso/EspressoDeviceSample/MainActivity.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.testing.espresso.EspressoDeviceSample;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * An empty {@link Activity} that Espresso Device APIs are tested against.
+ */
+public class MainActivity extends Activity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+ }
+}
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-hdpi/ic_launcher.png b/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 000000000..6b0f252c4
Binary files /dev/null and b/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-mdpi/ic_launcher.png b/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 000000000..b2fe59cc2
Binary files /dev/null and b/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..0edc166fe
Binary files /dev/null and b/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..252724020
Binary files /dev/null and b/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..0e23e29d8
Binary files /dev/null and b/ui/espresso/EspressoDeviceSample/app/src/main/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/res/layout/activity_main.xml b/ui/espresso/EspressoDeviceSample/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 000000000..3e52e22f1
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,24 @@
+
+
+
+
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/res/values-v13/styles.xml b/ui/espresso/EspressoDeviceSample/app/src/main/res/values-v13/styles.xml
new file mode 100644
index 000000000..90618916c
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/app/src/main/res/values-v13/styles.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/res/values-v21/styles.xml b/ui/espresso/EspressoDeviceSample/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 000000000..212313cbe
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/res/values-w820dp/dimens.xml b/ui/espresso/EspressoDeviceSample/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 000000000..87629a929
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,22 @@
+
+
+
+
+ 64dp
+
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/res/values/dimens.xml b/ui/espresso/EspressoDeviceSample/app/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..1d10763ef
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/app/src/main/res/values/dimens.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ 16dp
+ 32dp
+
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/res/values/strings.xml b/ui/espresso/EspressoDeviceSample/app/src/main/res/values/strings.xml
new file mode 100644
index 000000000..ad5c858e8
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/app/src/main/res/values/strings.xml
@@ -0,0 +1,20 @@
+
+
+
+ Basic Espresso Device sample
+ Hello Espresso!
+
diff --git a/ui/espresso/EspressoDeviceSample/app/src/main/res/values/styles.xml b/ui/espresso/EspressoDeviceSample/app/src/main/res/values/styles.xml
new file mode 100644
index 000000000..42dd2e3b8
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/app/src/main/res/values/styles.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ui/espresso/EspressoDeviceSample/build.gradle b/ui/espresso/EspressoDeviceSample/build.gradle
new file mode 100644
index 000000000..aeb7b2137
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/build.gradle
@@ -0,0 +1,34 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+ ext.kotlinVersion = "1.7.10"
+ ext.agpVersion = "7.3.0"
+ repositories {
+ // Insert local test repo here
+ google()
+ mavenCentral()
+ }
+ dependencies {
+ classpath "com.android.tools.build:gradle:$agpVersion"
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
+allprojects {
+ repositories {
+ // Insert local test repo here
+ google()
+ mavenCentral()
+ }
+}
+
+ext {
+ buildToolsVersion = "32.0.0"
+ robolectricVersion = "4.9"
+ extTruthVersion = "1.5.0-beta01"
+ extJUnitVersion = "1.1.4-beta01"
+ espressoDeviceVersion = "1.0.0-alpha01"
+}
diff --git a/ui/espresso/EspressoDeviceSample/gradle.properties b/ui/espresso/EspressoDeviceSample/gradle.properties
new file mode 100644
index 000000000..0121c0f71
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/gradle.properties
@@ -0,0 +1,19 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+android.useAndroidX=true
diff --git a/ui/espresso/EspressoDeviceSample/gradle/wrapper/gradle-wrapper.jar b/ui/espresso/EspressoDeviceSample/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..41d9927a4
Binary files /dev/null and b/ui/espresso/EspressoDeviceSample/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/ui/espresso/EspressoDeviceSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/EspressoDeviceSample/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..b1159fc54
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/ui/espresso/EspressoDeviceSample/gradlew b/ui/espresso/EspressoDeviceSample/gradlew
new file mode 100755
index 000000000..1b6c78733
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD=java
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/ui/espresso/EspressoDeviceSample/gradlew.bat b/ui/espresso/EspressoDeviceSample/gradlew.bat
new file mode 100644
index 000000000..ac1b06f93
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/ui/espresso/EspressoDeviceSample/settings.gradle b/ui/espresso/EspressoDeviceSample/settings.gradle
new file mode 100644
index 000000000..e7b4def49
--- /dev/null
+++ b/ui/espresso/EspressoDeviceSample/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/update_versions.sh b/update_versions.sh
index 91d6a2ec9..d0cf878d6 100755
--- a/update_versions.sh
+++ b/update_versions.sh
@@ -30,6 +30,7 @@ coreVersion="1.5.0-beta01" # CORE_VERSION
extJUnitVersion="1.1.4-beta01" # ANDROIDX_JUNIT_VERSION
extTruthVersion="1.5.0-beta01" # ANDROIDX_TRUTH_VERSION
espressoVersion="3.5.0-beta01" # ESPRESSO_VERSION
+espressoDeviceVersion="1.0.0-alpha01" # ESPRESSO_DEVICE_VERSION
robolectricVersion="4.9"
uiAutomatorVersion="2.2.0" # UIAUTOMATOR_VERSION