Remove Executor parameter from BaseSingleFoldDeviceAction

PiperOrigin-RevId: 549083553

Author: Paige McAuliffe

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

@@ -28,7 +28,6 @@ import androidx.window.layout.FoldingFeature
 import androidx.window.layout.WindowInfoTracker
 import androidx.window.layout.WindowLayoutInfo
 import java.util.concurrent.CountDownLatch
-import java.util.concurrent.Executor
 import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.collect
@@ -38,8 +37,7 @@ import kotlinx.coroutines.launch
 /** Action to set the test device to the provided device mode. */
 internal open class BaseSingleFoldDeviceAction(
   private val deviceMode: DeviceMode,
-  private val foldingFeatureState: FoldingFeature.State?,
-  private val mainExecutor: Executor
+  private val foldingFeatureState: FoldingFeature.State?
 ) : DeviceAction {
   protected var foldingFeatureOrientation: FoldingFeature.Orientation? = null
 

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

@@ -23,11 +23,10 @@ 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
 
 /** Action to set the test device to be folded with the hinge in the vertical position. */
-internal class BookModeAction(private val mainExecutor: Executor) :
-  BaseSingleFoldDeviceAction(DeviceMode.BOOK, FoldingFeature.State.HALF_OPENED, mainExecutor) {
+internal class BookModeAction() :
+  BaseSingleFoldDeviceAction(DeviceMode.BOOK, FoldingFeature.State.HALF_OPENED) {
   companion object {
     private val TAG = BookModeAction::class.java.simpleName
   }

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

@@ -21,11 +21,9 @@ import androidx.test.espresso.device.common.executeShellCommand
 import androidx.test.espresso.device.common.getMapOfDeviceStateNamesToIdentifiers
 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) {
+internal class ClosedModeAction() : BaseSingleFoldDeviceAction(DeviceMode.CLOSED, null) {
   override fun perform(deviceController: DeviceController) {
     val currentDeviceStateIdentifier = executeShellCommand("cmd device_state print-state").trim()
     if (currentDeviceStateIdentifier == getMapOfDeviceStateNamesToIdentifiers().get("CLOSED")) {

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

@@ -18,16 +18,12 @@
 
 package androidx.test.espresso.device.action
 
-import android.os.Handler
-import android.os.Looper
 import androidx.annotation.RestrictTo
 import androidx.annotation.RestrictTo.Scope
 import androidx.test.espresso.device.sizeclass.HeightSizeClass
 import androidx.test.espresso.device.sizeclass.WidthSizeClass
-import java.util.concurrent.Executor
 
 /** Entry point for device action operations. */
-private val mainExecutor = Executor { command -> Handler(Looper.getMainLooper()).post(command) }
 
 /**
  * Set device screen to be folded with the hinge in the horizontal position. For details on foldable
@@ -41,7 +37,7 @@ private val mainExecutor = Executor { command -> Handler(Looper.getMainLooper())
  * @throws DeviceControllerOperationException when called on a non-foldable Emulator.
  */
 fun setTabletopMode(): DeviceAction {
-  return TabletopModeAction(mainExecutor)
+  return TabletopModeAction()
 }
 
 /**
@@ -56,7 +52,7 @@ fun setTabletopMode(): DeviceAction {
  * @throws DeviceControllerOperationException when called on a non-foldable Emulator.
  */
 fun setBookMode(): DeviceAction {
-  return BookModeAction(mainExecutor)
+  return BookModeAction()
 }
 
 /**
@@ -70,7 +66,7 @@ fun setBookMode(): DeviceAction {
  * @throws DeviceControllerOperationException when called on a non-foldable Emulator.
  */
 fun setFlatMode(): DeviceAction {
-  return FlatModeAction(mainExecutor)
+  return FlatModeAction()
 }
 
 /**
@@ -83,7 +79,7 @@ fun setFlatMode(): DeviceAction {
  * @throws DeviceControllerOperationException when called on a non-foldable Emulator.
  */
 fun setClosedMode(): DeviceAction {
-  return ClosedModeAction(mainExecutor)
+  return ClosedModeAction()
 }
 
 /**

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

@@ -22,11 +22,10 @@ import androidx.test.espresso.device.common.getMapOfDeviceStateNamesToIdentifier
 import androidx.test.espresso.device.controller.DeviceMode
 import androidx.test.platform.device.DeviceController
 import androidx.window.layout.FoldingFeature
-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) {
+internal class FlatModeAction() :
+  BaseSingleFoldDeviceAction(DeviceMode.FLAT, FoldingFeature.State.FLAT) {
   override fun perform(deviceController: DeviceController) {
     val currentDeviceStateIdentifier = executeShellCommand("cmd device_state print-state").trim()
     if (currentDeviceStateIdentifier == getMapOfDeviceStateNamesToIdentifiers().get("OPENED")) {

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

@@ -23,11 +23,10 @@ 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
 
 /** Action to set the test device to be folded with the hinge in a horizontal position. */
-internal class TabletopModeAction(private val mainExecutor: Executor) :
-  BaseSingleFoldDeviceAction(DeviceMode.TABLETOP, FoldingFeature.State.HALF_OPENED, mainExecutor) {
+internal class TabletopModeAction() :
+  BaseSingleFoldDeviceAction(DeviceMode.TABLETOP, FoldingFeature.State.HALF_OPENED) {
   companion object {
     private val TAG = TabletopModeAction::class.java.simpleName
   }