Create common package for Espresso Device shared methods

Paige McAuliffe · copybara-androidxtest · commit 2552e2ef63d8 · 2023-05-31T09:44:41.000-07:00
PiperOrigin-RevId: 536740467
diff --git a/espresso/device/java/androidx/test/espresso/device/action/BUILD b/espresso/device/java/androidx/test/espresso/device/action/BUILD
@@ -18,10 +18,10 @@ kt_android_library(
     srcs = glob(["*.kt"]),
     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",
-        "//espresso/device/java/androidx/test/espresso/device/util",
         "//runner/monitor",
         "@maven//:androidx_window_window",
         "@maven//:androidx_window_window_java",
diff --git a/espresso/device/java/androidx/test/espresso/device/action/BaseSingleFoldDeviceAction.kt b/espresso/device/java/androidx/test/espresso/device/action/BaseSingleFoldDeviceAction.kt
@@ -17,11 +17,11 @@
 package androidx.test.espresso.device.action
 
 import android.util.Log
+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.espresso.device.util.getResumedActivityOrNull
-import androidx.test.espresso.device.util.isRobolectricTest
 import androidx.test.platform.device.DeviceController
 import androidx.window.layout.FoldingFeature
 import androidx.window.layout.WindowInfoTracker
diff --git a/espresso/device/java/androidx/test/espresso/device/action/ClosedModeAction.kt b/espresso/device/java/androidx/test/espresso/device/action/ClosedModeAction.kt
@@ -17,10 +17,10 @@
 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.espresso.device.util.executeShellCommand
-import androidx.test.espresso.device.util.getMapOfDeviceStateNamesToIdentifiers
 import androidx.test.platform.device.DeviceController
 import java.util.concurrent.Executor
 
diff --git a/espresso/device/java/androidx/test/espresso/device/action/DisplaySizeAction.kt b/espresso/device/java/androidx/test/espresso/device/action/DisplaySizeAction.kt
@@ -21,14 +21,14 @@ import android.content.res.Configuration
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
+import androidx.test.espresso.device.common.calculateCurrentDisplayWidthAndHeightPx
+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
-import androidx.test.espresso.device.util.calculateCurrentDisplayWidthAndHeightPx
-import androidx.test.espresso.device.util.executeShellCommand
-import androidx.test.espresso.device.util.getDeviceApiLevel
-import androidx.test.espresso.device.util.getResumedActivityOrNull
 import androidx.test.platform.device.DeviceController
 import androidx.test.platform.device.UnsupportedDeviceOperationException
 import java.util.concurrent.CountDownLatch
diff --git a/espresso/device/java/androidx/test/espresso/device/action/FlatModeAction.kt b/espresso/device/java/androidx/test/espresso/device/action/FlatModeAction.kt
@@ -17,10 +17,10 @@
 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.espresso.device.util.executeShellCommand
-import androidx.test.espresso.device.util.getMapOfDeviceStateNamesToIdentifiers
 import androidx.test.platform.device.DeviceController
 import androidx.window.layout.FoldingFeature
 import java.util.concurrent.Executor
diff --git a/espresso/device/java/androidx/test/espresso/device/action/ScreenOrientationAction.kt b/espresso/device/java/androidx/test/espresso/device/action/ScreenOrientationAction.kt
@@ -25,15 +25,15 @@ import android.os.Handler
 import android.os.HandlerThread
 import android.provider.Settings.System
 import android.util.Log
+import androidx.test.espresso.device.common.SettingsObserver
+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.common.isConfigurationChangeHandled
+import androidx.test.espresso.device.common.isRobolectricTest
+import androidx.test.espresso.device.common.isTestDeviceAnEmulator
 import androidx.test.espresso.device.context.ActionContext
 import androidx.test.espresso.device.controller.DeviceControllerOperationException
-import androidx.test.espresso.device.util.SettingsObserver
-import androidx.test.espresso.device.util.executeShellCommand
-import androidx.test.espresso.device.util.getDeviceApiLevel
-import androidx.test.espresso.device.util.getResumedActivityOrNull
-import androidx.test.espresso.device.util.isConfigurationChangeHandled
-import androidx.test.espresso.device.util.isRobolectricTest
-import androidx.test.espresso.device.util.isTestDeviceAnEmulator
 import androidx.test.platform.device.DeviceController
 import androidx.test.platform.device.UnsupportedDeviceOperationException
 import androidx.test.runner.lifecycle.ActivityLifecycleCallback
diff --git a/espresso/device/java/androidx/test/espresso/device/common/ActivityUtil.kt b/espresso/device/java/androidx/test/espresso/device/common/ActivityUtil.kt
@@ -16,7 +16,7 @@
 
 @file:JvmName("ActivityUtil")
 
-package androidx.test.espresso.device.util
+package androidx.test.espresso.device.common
 
 import android.app.Activity
 import android.util.Log
diff --git a/espresso/device/java/androidx/test/espresso/device/common/BUILD b/espresso/device/java/androidx/test/espresso/device/common/BUILD
@@ -1,5 +1,5 @@
 # Description:
-#  Utility classes
+#  Espresso Device shared utils
 
 load("//build_extensions:kt_android_library.bzl", "kt_android_library")
 
@@ -13,7 +13,7 @@ package(
 )
 
 kt_android_library(
-    name = "util",
+    name = "common",
     testonly = 1,
     srcs = glob([
         "*.kt",
diff --git a/espresso/device/java/androidx/test/espresso/device/common/DeviceUtil.kt b/espresso/device/java/androidx/test/espresso/device/common/DeviceUtil.kt
@@ -16,7 +16,7 @@
 
 @file:JvmName("DeviceUtil")
 
-package androidx.test.espresso.device.util
+package androidx.test.espresso.device.common
 
 import android.os.Build
 import androidx.annotation.RequiresApi
diff --git a/espresso/device/java/androidx/test/espresso/device/common/SettingsObserver.kt b/espresso/device/java/androidx/test/espresso/device/common/SettingsObserver.kt
@@ -1,4 +1,19 @@
-package androidx.test.espresso.device.util
+/*
+ * Copyright (C) 2023 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 androidx.test.espresso.device.common
 
 import android.content.ContentResolver
 import android.content.Context
diff --git a/espresso/device/java/androidx/test/espresso/device/common/UiAutomationUtil.kt b/espresso/device/java/androidx/test/espresso/device/common/UiAutomationUtil.kt
@@ -16,7 +16,7 @@
 
 @file:JvmName("UiAutomationUtil")
 
-package androidx.test.espresso.device.util
+package androidx.test.espresso.device.common
 
 import android.os.Build
 import android.os.ParcelFileDescriptor.AutoCloseInputStream
diff --git a/espresso/device/java/androidx/test/espresso/device/common/package-info.java b/espresso/device/java/androidx/test/espresso/device/common/package-info.java
@@ -16,7 +16,7 @@
 
 /** @hide */
 @RestrictTo(Scope.LIBRARY)
-package androidx.test.espresso.device.util;
+package androidx.test.espresso.device.common;
 
 import androidx.annotation.RestrictTo;
 import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/BUILD b/espresso/device/java/androidx/test/espresso/device/controller/BUILD
@@ -32,8 +32,8 @@ kt_android_library(
         "PhysicalDeviceController.kt",
     ],
     deps = [
+        "//espresso/device/java/androidx/test/espresso/device/common",
         "//espresso/device/java/androidx/test/espresso/device/controller",
-        "//espresso/device/java/androidx/test/espresso/device/util",
         "//runner/monitor",
         "@maven//:androidx_annotation_annotation",
     ],
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/PhysicalDeviceController.kt b/espresso/device/java/androidx/test/espresso/device/controller/PhysicalDeviceController.kt
@@ -22,8 +22,8 @@ import android.os.HandlerThread
 import android.provider.Settings.System
 import android.view.Surface
 import androidx.annotation.RestrictTo
-import androidx.test.espresso.device.util.SettingsObserver
-import androidx.test.espresso.device.util.executeShellCommand
+import androidx.test.espresso.device.common.SettingsObserver
+import androidx.test.espresso.device.common.executeShellCommand
 import androidx.test.platform.device.DeviceController
 import androidx.test.platform.device.UnsupportedDeviceOperationException
 import java.util.concurrent.CountDownLatch
diff --git a/espresso/device/java/androidx/test/espresso/device/dagger/BUILD b/espresso/device/java/androidx/test/espresso/device/dagger/BUILD
@@ -15,12 +15,12 @@ kt_android_library(
     testonly = 1,
     srcs = glob(["*.kt"]),
     deps = [
+        "//espresso/device/java/androidx/test/espresso/device/common",
         "//espresso/device/java/androidx/test/espresso/device/context",
         "//espresso/device/java/androidx/test/espresso/device/context:context_impl",
         "//espresso/device/java/androidx/test/espresso/device/controller",
         "//espresso/device/java/androidx/test/espresso/device/controller:controller_impl",
         "//espresso/device/java/androidx/test/espresso/device/controller/emulator",
-        "//espresso/device/java/androidx/test/espresso/device/util",
         "//opensource/dagger",
         "//runner/monitor",
         "@maven//:androidx_annotation_annotation",
diff --git a/espresso/device/java/androidx/test/espresso/device/dagger/DeviceControllerModule.kt b/espresso/device/java/androidx/test/espresso/device/dagger/DeviceControllerModule.kt
@@ -17,15 +17,15 @@ package androidx.test.espresso.device.dagger
 
 import android.provider.Settings
 import androidx.annotation.RestrictTo
+import androidx.test.espresso.device.common.getDeviceApiLevel
+import androidx.test.espresso.device.common.isTestDeviceAnEmulator
 import androidx.test.espresso.device.context.ActionContext
 import androidx.test.espresso.device.context.InstrumentationTestActionContext
 import androidx.test.espresso.device.controller.DeviceControllerOperationException
 import androidx.test.espresso.device.controller.PhysicalDeviceController
 import androidx.test.espresso.device.controller.emulator.EmulatorController
 import androidx.test.espresso.device.controller.emulator.EmulatorGrpcConn
 import androidx.test.espresso.device.controller.emulator.EmulatorGrpcConnImpl
-import androidx.test.espresso.device.util.getDeviceApiLevel
-import androidx.test.espresso.device.util.isTestDeviceAnEmulator
 import androidx.test.internal.platform.ServiceLoaderWrapper
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.platform.device.DeviceController
diff --git a/espresso/device/java/androidx/test/espresso/device/filter/BUILD b/espresso/device/java/androidx/test/espresso/device/filter/BUILD
@@ -18,9 +18,9 @@ kt_android_library(
     srcs = glob(["*.kt"]),
     deps = [
         "//annotation/java/androidx/test/annotation",
+        "//espresso/device/java/androidx/test/espresso/device/common",
         "//espresso/device/java/androidx/test/espresso/device/controller",
         "//espresso/device/java/androidx/test/espresso/device/sizeclass",
-        "//espresso/device/java/androidx/test/espresso/device/util",
         "//runner/android_junit_runner",
         "//runner/monitor",
         "@maven//:junit_junit",
diff --git a/espresso/device/java/androidx/test/espresso/device/filter/RequiresDeviceModeFilter.kt b/espresso/device/java/androidx/test/espresso/device/filter/RequiresDeviceModeFilter.kt
@@ -17,8 +17,8 @@ package androidx.test.espresso.device.filter
 
 import android.os.Build
 import android.util.Log
+import androidx.test.espresso.device.common.executeShellCommand
 import androidx.test.espresso.device.controller.DeviceMode
-import androidx.test.espresso.device.util.executeShellCommand
 import androidx.test.filters.AbstractFilter
 import org.junit.runner.Description
 
diff --git a/espresso/device/java/androidx/test/espresso/device/rules/BUILD b/espresso/device/java/androidx/test/espresso/device/rules/BUILD
@@ -20,8 +20,8 @@ kt_android_library(
         "//annotation/java/androidx/test/annotation",
         "//espresso/device/java/androidx/test/espresso/device",
         "//espresso/device/java/androidx/test/espresso/device/action",
+        "//espresso/device/java/androidx/test/espresso/device/common",
         "//espresso/device/java/androidx/test/espresso/device/controller",
-        "//espresso/device/java/androidx/test/espresso/device/util",
         "//runner/monitor",
         "@maven//:junit_junit",
     ],
diff --git a/espresso/device/java/androidx/test/espresso/device/rules/DisplaySizeRule.kt b/espresso/device/java/androidx/test/espresso/device/rules/DisplaySizeRule.kt
@@ -21,11 +21,11 @@ import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import androidx.test.annotation.ExperimentalTestApi
+import androidx.test.espresso.device.common.calculateCurrentDisplayWidthAndHeightPx
+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.controller.DeviceControllerOperationException
-import androidx.test.espresso.device.util.calculateCurrentDisplayWidthAndHeightPx
-import androidx.test.espresso.device.util.executeShellCommand
-import androidx.test.espresso.device.util.getDeviceApiLevel
-import androidx.test.espresso.device.util.getResumedActivityOrNull
 import androidx.test.platform.device.UnsupportedDeviceOperationException
 import androidx.test.runner.lifecycle.ActivityLifecycleCallback
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
