Update setup guide URL for Espresso Device setup

PiperOrigin-RevId: 670696336
android · Sep 3, 2024 · 045dda0 · 045dda0
1 parent 453f494
commit 045dda0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/espresso/device/CHANGELOG.md b/espresso/device/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 * Add support for setting screen orientation with multiple resumed activities
 * Fix concurrent modification issue when setting screen orientation and fold modes
+* Adjust reference docs to state set up guide is now located at https://developer.android.com/studio/test/espresso-api#set_up_your_project_for_the_espresso_device_api
 
 **New Features**
 

diff --git a/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorController.kt b/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorController.kt
@@ -52,6 +52,8 @@ constructor(
     private val TAG = EmulatorController::class.java.simpleName
     private const val DEGREES_TO_ROTATE_LANDSCAPE_TO_PORTRAIT = -90F
     private const val DEGREES_TO_ROTATE_PORTRAIT_TO_LANDSCAPE = 90F
+    private const val additionalSetUpInstructions =
+      " See https://developer.android.com/studio/test/espresso-api#set_up_your_project_for_the_espresso_device_api for set up instructions."
   }
 
   override fun setDeviceMode(deviceMode: Int) {
@@ -82,8 +84,8 @@ constructor(
       throw DeviceControllerOperationException(
         "Failed to set device mode. Please make sure the connected Emulator is foldable, the Android Emulator version" +
           " is updated to 33.1.11+, and the controller gRPC service is enabled on the emulator" +
-          " See https://developer.android.com/studio/preview/features#set_up_your_project_for_the_espresso_device_api for set up instructions.",
-        e
+          additionalSetUpInstructions,
+        e,
       )
     }
   }
@@ -131,8 +133,8 @@ constructor(
       throw DeviceControllerOperationException(
         "Failed to set screen orientation. Please make sure the Android Emulator version" +
           " is updated to 33.1.11+ and the controller gRPC service is enabled on the emulator." +
-          " See https://developer.android.com/studio/preview/features#set_up_your_project_for_the_espresso_device_api for set up instructions.",
-        e
+          additionalSetUpInstructions,
+        e,
       )
     }
   }
@@ -150,8 +152,8 @@ constructor(
     ) {
       throw DeviceControllerOperationException(
         "The current process does not have the INTERNET permission. Ensure the app-under-test has '<uses-permission " +
-          "android:name=\"android.permission.INTERNET\"/>' in its AndroidManifest.xml. See " +
-          "See https://developer.android.com/studio/preview/features#set_up_your_project_for_the_espresso_device_api for set up instructions."
+          "android:name=\"android.permission.INTERNET\"/>' in its AndroidManifest.xml." +
+          additionalSetUpInstructions
       )
     }
   }

diff --git a/espresso/device/java/androidx/test/espresso/device/dagger/DeviceControllerModule.kt b/espresso/device/java/androidx/test/espresso/device/dagger/DeviceControllerModule.kt
@@ -106,7 +106,7 @@ internal class DeviceControllerModule {
       throw DeviceControllerOperationException(
         "Unable to connect to Emulator gRPC port. Please make sure the Android Emulator version" +
           " is updated to 33.1.11+ and the controller gRPC service is enabled on the emulator." +
-          " See https://developer.android.com/studio/preview/features#set_up_your_project_for_the_espresso_device_api for set up instructions."
+          " See https://developer.android.com/studio/test/espresso-api#set_up_your_project_for_the_espresso_device_api for set up instructions."
       )
     }
     return gRpcPort.toInt()