Remove ActionContext interface

PiperOrigin-RevId: 548727053

Author: Paige McAuliffe

espresso/device/java/androidx/test/espresso/device/BUILD

@@ -37,7 +37,6 @@ kt_android_library(
     deps = [
         "//annotation/java/androidx/test/annotation",
         "//espresso/device/java/androidx/test/espresso/device/action",
-        "//espresso/device/java/androidx/test/espresso/device/context",
         "//espresso/device/java/androidx/test/espresso/device/dagger",
         "//espresso/device/java/androidx/test/espresso/device/sizeclass",
         "//opensource/dagger",

espresso/device/java/androidx/test/espresso/device/DeviceInteraction.kt

@@ -24,7 +24,6 @@ import androidx.test.espresso.device.action.setDisplaySize as getSetDisplaySizeD
 import androidx.test.espresso.device.action.setFlatMode as getSetFlatModeDeviceAction
 import androidx.test.espresso.device.action.setScreenOrientation as getSetScreenOrientationDeviceAction
 import androidx.test.espresso.device.action.setTabletopMode as getSetTabletopModeDeviceAction
-import androidx.test.espresso.device.context.ActionContext
 import androidx.test.espresso.device.sizeclass.HeightSizeClass
 import androidx.test.espresso.device.sizeclass.WidthSizeClass
 import androidx.test.internal.util.Checks.checkNotMainThread
@@ -37,9 +36,7 @@ import javax.inject.Inject
  * <p>This API is experimental and subject to change.
  */
 @ExperimentalTestApi
-class DeviceInteraction
-@Inject
-constructor(private val context: ActionContext, private val deviceController: DeviceController) {
+class DeviceInteraction @Inject constructor(private val deviceController: DeviceController) {
 
   /**
    * Performs the given action on the test device. This method should not be called on the main
@@ -51,7 +48,7 @@ constructor(private val context: ActionContext, private val deviceController: De
    */
   fun perform(action: DeviceAction): DeviceInteraction {
     checkNotMainThread()
-    action.perform(context, deviceController)
+    action.perform(deviceController)
     return this
   }
 

espresso/device/java/androidx/test/espresso/device/EspressoDevice.kt

@@ -39,7 +39,7 @@ class EspressoDevice private constructor() {
     @JvmStatic
     fun onDevice(): DeviceInteraction {
       checkNotMainThread()
-      return DeviceInteraction(BASE.actionContext(), BASE.deviceController())
+      return DeviceInteraction(BASE.deviceController())
     }
   }
 }

espresso/device/java/androidx/test/espresso/device/action/BUILD

@@ -19,7 +19,6 @@ kt_android_library(
     deps = [
         "//annotation/java/androidx/test/annotation",
         "//espresso/device/java/androidx/test/espresso/device/common",
-        "//espresso/device/java/androidx/test/espresso/device/context",
         "//espresso/device/java/androidx/test/espresso/device/controller",
         "//espresso/device/java/androidx/test/espresso/device/sizeclass",
         "//runner/monitor",

espresso/device/java/androidx/test/espresso/device/action/BaseSingleFoldDeviceAction.kt

@@ -21,7 +21,6 @@ import androidx.test.espresso.device.common.executeShellCommand
 import androidx.test.espresso.device.common.getMapOfDeviceStateNamesToIdentifiers
 import androidx.test.espresso.device.common.getResumedActivityOrNull
 import androidx.test.espresso.device.common.isRobolectricTest
-import androidx.test.espresso.device.context.ActionContext
 import androidx.test.espresso.device.controller.DeviceControllerOperationException
 import androidx.test.espresso.device.controller.DeviceMode
 import androidx.test.platform.device.DeviceController
@@ -50,7 +49,7 @@ internal open class BaseSingleFoldDeviceAction(
   }
 
   @OptIn(androidx.window.core.ExperimentalWindowApi::class)
-  override fun perform(context: ActionContext, deviceController: DeviceController) {
+  override fun perform(deviceController: DeviceController) {
     if (isRobolectricTest()) {
       deviceController.setDeviceMode(deviceMode.getMode())
       return

espresso/device/java/androidx/test/espresso/device/action/BookModeAction.kt

@@ -18,9 +18,9 @@ package androidx.test.espresso.device.action
 
 import android.content.res.Configuration
 import android.util.Log
-import androidx.test.espresso.device.context.ActionContext
 import androidx.test.espresso.device.controller.DeviceControllerOperationException
 import androidx.test.espresso.device.controller.DeviceMode
+import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.platform.device.DeviceController
 import androidx.window.layout.FoldingFeature
 import java.util.concurrent.Executor
@@ -32,9 +32,9 @@ internal class BookModeAction(private val mainExecutor: Executor) :
     private val TAG = BookModeAction::class.java.simpleName
   }
 
-  override fun perform(context: ActionContext, deviceController: DeviceController) {
+  override fun perform(deviceController: DeviceController) {
     // TODO(b/203801760): Check current device mode and return if already in book mode.
-    super.perform(context, deviceController)
+    super.perform(deviceController)
 
     if (super.foldingFeatureOrientation == null) {
       throw DeviceControllerOperationException(
@@ -43,14 +43,18 @@ internal class BookModeAction(private val mainExecutor: Executor) :
     } else if (super.foldingFeatureOrientation != FoldingFeature.Orientation.VERTICAL) {
       Log.d(TAG, "FoldingFeature orientation needs to be rotated.")
       val orientationToRotateTo =
-        if (context.applicationContext.getResources().getConfiguration().orientation ==
-            Configuration.ORIENTATION_PORTRAIT
+        if (
+          InstrumentationRegistry.getInstrumentation()
+            .getTargetContext()
+            .getResources()
+            .getConfiguration()
+            .orientation == Configuration.ORIENTATION_PORTRAIT
         ) {
           ScreenOrientation.LANDSCAPE
         } else {
           ScreenOrientation.PORTRAIT
         }
-      ScreenOrientationAction(orientationToRotateTo).perform(context, deviceController)
+      ScreenOrientationAction(orientationToRotateTo).perform(deviceController)
     }
   }
 }

espresso/device/java/androidx/test/espresso/device/action/ClosedModeAction.kt

@@ -19,15 +19,14 @@ package androidx.test.espresso.device.action
 import android.util.Log
 import androidx.test.espresso.device.common.executeShellCommand
 import androidx.test.espresso.device.common.getMapOfDeviceStateNamesToIdentifiers
-import androidx.test.espresso.device.context.ActionContext
 import androidx.test.espresso.device.controller.DeviceMode
 import androidx.test.platform.device.DeviceController
 import java.util.concurrent.Executor
 
 /** Action to set the test device to be closed. */
 internal class ClosedModeAction(private val mainExecutor: Executor) :
   BaseSingleFoldDeviceAction(DeviceMode.CLOSED, null, mainExecutor) {
-  override fun perform(context: ActionContext, deviceController: DeviceController) {
+  override fun perform(deviceController: DeviceController) {
     val currentDeviceStateIdentifier = executeShellCommand("cmd device_state print-state").trim()
     if (currentDeviceStateIdentifier == getMapOfDeviceStateNamesToIdentifiers().get("CLOSED")) {
       if (Log.isLoggable(TAG, Log.DEBUG)) {
@@ -36,7 +35,7 @@ internal class ClosedModeAction(private val mainExecutor: Executor) :
       return
     }
 
-    super.perform(context, deviceController)
+    super.perform(deviceController)
   }
 
   companion object {

espresso/device/java/androidx/test/espresso/device/action/DeviceAction.kt

@@ -17,7 +17,6 @@
 package androidx.test.espresso.device.action
 
 import androidx.test.annotation.ExperimentalTestApi
-import androidx.test.espresso.device.context.ActionContext
 import androidx.test.platform.device.DeviceController
 
 /** Responsible for performing an interaction on the given device. */
@@ -26,8 +25,7 @@ interface DeviceAction {
   /**
    * Performs this action on the given device.
    *
-   * @param context the ActionContext containing the context for this application and test app.
    * @param deviceController the controller to use to interact with the device.
    */
-  fun perform(context: ActionContext, deviceController: DeviceController)
+  fun perform(deviceController: DeviceController)
 }

espresso/device/java/androidx/test/espresso/device/action/DisplaySizeAction.kt

@@ -25,7 +25,6 @@ import androidx.test.espresso.device.common.calculateCurrentDisplayWidthAndHeigh
 import androidx.test.espresso.device.common.executeShellCommand
 import androidx.test.espresso.device.common.getDeviceApiLevel
 import androidx.test.espresso.device.common.getResumedActivityOrNull
-import androidx.test.espresso.device.context.ActionContext
 import androidx.test.espresso.device.controller.DeviceControllerOperationException
 import androidx.test.espresso.device.sizeclass.HeightSizeClass
 import androidx.test.espresso.device.sizeclass.WidthSizeClass
@@ -40,7 +39,7 @@ internal class DisplaySizeAction(
   val widthDisplaySize: WidthSizeClass,
   val heightDisplaySize: HeightSizeClass
 ) : DeviceAction {
-  override fun perform(context: ActionContext, deviceController: DeviceController) {
+  override fun perform(deviceController: DeviceController) {
     if (getDeviceApiLevel() < 24) {
       throw UnsupportedDeviceOperationException(
         "Setting display size is not supported on devices with APIs below 24."

espresso/device/java/androidx/test/espresso/device/action/FlatModeAction.kt

@@ -19,7 +19,6 @@ package androidx.test.espresso.device.action
 import android.util.Log
 import androidx.test.espresso.device.common.executeShellCommand
 import androidx.test.espresso.device.common.getMapOfDeviceStateNamesToIdentifiers
-import androidx.test.espresso.device.context.ActionContext
 import androidx.test.espresso.device.controller.DeviceMode
 import androidx.test.platform.device.DeviceController
 import androidx.window.layout.FoldingFeature
@@ -28,7 +27,7 @@ import java.util.concurrent.Executor
 /** Action to set the test device to be completely flat, like a tablet. */
 internal class FlatModeAction(private val mainExecutor: Executor) :
   BaseSingleFoldDeviceAction(DeviceMode.FLAT, FoldingFeature.State.FLAT, mainExecutor) {
-  override fun perform(context: ActionContext, deviceController: DeviceController) {
+  override fun perform(deviceController: DeviceController) {
     val currentDeviceStateIdentifier = executeShellCommand("cmd device_state print-state").trim()
     if (currentDeviceStateIdentifier == getMapOfDeviceStateNamesToIdentifiers().get("OPENED")) {
       if (Log.isLoggable(TAG, Log.DEBUG)) {
@@ -37,7 +36,7 @@ internal class FlatModeAction(private val mainExecutor: Executor) :
       return
     }
 
-    super.perform(context, deviceController)
+    super.perform(deviceController)
   }
 
   companion object {