Enable setting screen orientation on API 34 half-folded devices

PiperOrigin-RevId: 620042179
android · Mar 28, 2024 · c6c0a5b · c6c0a5b
1 parent 10dfce5
commit c6c0a5b
Show file tree

Hide file tree

Showing 52 changed files with 85 additions and 80 deletions.
diff --git a/BUILD b/BUILD
@@ -1,6 +1,6 @@
-load("//build_extensions/maven:maven_repo.bzl", "maven_repository")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 load("@rules_license//rules:license.bzl", "license")
+load("//build_extensions/maven:maven_repo.bzl", "maven_repository")
 
 package(default_visibility = ["//:__subpackages__"])
 

diff --git a/annotation/java/androidx/test/annotation/BUILD b/annotation/java/androidx/test/annotation/BUILD
@@ -1,10 +1,10 @@
 # Description: Build rules for building androidx.test.annotation from source
 
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 load("//build_extensions:api_checks.bzl", "api_checks")
 load("//build_extensions:dackka_test.bzl", "dackka_test")
 load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
 load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 
 # all users should reference the equivalent targets in //annotation
 package(

diff --git a/build_extensions/android_app_instrumentation_tests.bzl b/build_extensions/android_app_instrumentation_tests.bzl
@@ -1,6 +1,5 @@
 """A rule wrapper for an instrumentation test for an android binary."""
 
-load("//build_extensions:kt_android_library.bzl", "kt_android_library")
 load(
     "//build_extensions:generate_instrumentation_tests.bzl",
     "generate_instrumentation_tests",
@@ -10,6 +9,7 @@ load(
     "infer_java_package_name",
     "infer_java_package_name_from_label",
 )
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
 load("//build_extensions:register_extension_info.bzl", "register_extension_info")
 
 def android_app_instrumentation_tests(

diff --git a/build_extensions/android_library_instrumentation_tests.bzl b/build_extensions/android_library_instrumentation_tests.bzl
@@ -1,6 +1,5 @@
 """A rule wrapper for an instrumentation test for an android library."""
 
-load("//build_extensions:kt_android_library.bzl", "kt_android_library")
 load(
     "//build_extensions:generate_instrumentation_tests.bzl",
     "generate_instrumentation_tests",
@@ -9,6 +8,7 @@ load(
     "//build_extensions:infer_java_package_name.bzl",
     "infer_java_package_name",
 )
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
 load("//build_extensions:register_extension_info.bzl", "register_extension_info")
 
 def android_library_instrumentation_tests(

diff --git a/core/java/androidx/test/core/BUILD b/core/java/androidx/test/core/BUILD
@@ -1,11 +1,11 @@
 # Description: Build rules for building androidx.test.truth from source
 
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 load("//build_extensions:api_checks.bzl", "api_checks")
 load("//build_extensions:dackka_test.bzl", "dackka_test")
 load("//build_extensions:kt_android_library.bzl", "kt_android_library")
 load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
 load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 
 # all users should reference the equivalent targets in //core
 package(

diff --git a/core/javatests/androidx/test/core/app/BUILD b/core/javatests/androidx/test/core/app/BUILD
@@ -1,9 +1,9 @@
 # Description: Tests for androidx.test.core
 
+load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
 load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
 load("//build_extensions:axt_android_application_test.bzl", "axt_android_application_test")
 load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
-load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
 load("//build_extensions:phone_devices.bzl", "devices")
 
 package(

diff --git a/core/javatests/androidx/test/core/content/pm/BUILD b/core/javatests/androidx/test/core/content/pm/BUILD
@@ -1,7 +1,7 @@
 # Description: Tests for androidx.test.core
 
-load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
 load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
 
 package(
     default_applicable_licenses = ["//:license"],

diff --git a/core/javatests/androidx/test/core/os/BUILD b/core/javatests/androidx/test/core/os/BUILD
@@ -1,7 +1,7 @@
 # Description: Tests for androidx.test.core
 
-load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
 load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
 
 package(
     default_applicable_licenses = ["//:license"],

diff --git a/core/javatests/androidx/test/core/view/BUILD b/core/javatests/androidx/test/core/view/BUILD
@@ -1,7 +1,7 @@
 # Description: Tests for androidx.test.core
 
-load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
 load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
 
 package(
     default_applicable_licenses = ["//:license"],

diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/BUILD b/espresso/accessibility/java/androidx/test/espresso/accessibility/BUILD
@@ -1,8 +1,8 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
 load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
 load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
-load("//build_extensions:dackka_test.bzl", "dackka_test")
-load("//build_extensions:api_checks.bzl", "api_checks")
 
 # Description:
 # Espresso Accessibility APIs

diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/BUILD b/espresso/contrib/java/androidx/test/espresso/contrib/BUILD
@@ -1,9 +1,9 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 load("//build_extensions:api_checks.bzl", "api_checks")
 load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions:jetify.bzl", "jetify_android_library")
 load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
 load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
-load("//build_extensions:jetify.bzl", "jetify_android_library")
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 
 # Description:
 #   Contributed / non-core functionality of Espresso. Tools which add on to

diff --git a/espresso/core/java/androidx/test/espresso/BUILD b/espresso/core/java/androidx/test/espresso/BUILD
@@ -1,11 +1,11 @@
 # Description:
 #   Espresso - the new UI Test API for Android.
 
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 load("//build_extensions:api_checks.bzl", "api_checks")
 load("//build_extensions:dackka_test.bzl", "dackka_test")
 load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
 load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 
 licenses(["notice"])
 

diff --git a/espresso/core/javatests/androidx/test/espresso/BUILD b/espresso/core/javatests/androidx/test/espresso/BUILD
@@ -1,6 +1,7 @@
 # Description:
 #   Tests for espresso core
 
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 load(
     "//build_extensions:android_library_test.bzl",
     "axt_android_library_test",
@@ -9,7 +10,6 @@ load(
     "//build_extensions:axt_android_application_test.bzl",
     "axt_android_application_test",
 )
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 
 package(default_applicable_licenses = ["//espresso:license"])
 

diff --git a/espresso/core/javatests/androidx/test/espresso/matcher/BUILD b/espresso/core/javatests/androidx/test/espresso/matcher/BUILD
@@ -1,11 +1,11 @@
 # Description:
 #   Tests for espresso matchers
 
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 load(
     "//build_extensions:android_library_test.bzl",
     "axt_android_library_test",
 )
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 load(
     "//build_extensions:phone_devices.bzl",
     "apis",

diff --git a/espresso/core/javatests/androidx/test/espresso/remote/BUILD b/espresso/core/javatests/androidx/test/espresso/remote/BUILD
@@ -1,11 +1,11 @@
 # Description:
 #   Tests for espresso remote classes
 
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 load(
     "//build_extensions:android_library_test.bzl",
     "axt_android_library_test",
 )
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 
 package(default_applicable_licenses = ["//espresso:license"])
 

diff --git a/espresso/device/CHANGELOG.md b/espresso/device/CHANGELOG.md
@@ -5,7 +5,8 @@
 `androidx.test.espresso:espresso-device:{version}` is released.
 
 **Bug Fixes**
-Clarify error messaging for setting screen orientation without a resumed activity
+* Clarify error messaging for setting screen orientation without a resumed activity
+* Support setting screen orientation on half-folded API 34 physical devices
 
 **New Features**
 

diff --git a/espresso/device/java/androidx/test/espresso/device/BUILD b/espresso/device/java/androidx/test/espresso/device/BUILD
@@ -1,12 +1,12 @@
 # Description:
 #   EspressoDevice - the new Synchronized Device State Change API for Android.
 
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 load("//build_extensions:api_checks.bzl", "api_checks")
 load("//build_extensions:dackka_test.bzl", "dackka_test")
 load("//build_extensions:kt_android_library.bzl", "kt_android_library")
 load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
 load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 
 licenses(["notice"])
 

diff --git a/espresso/device/java/androidx/test/espresso/device/action/BookModeAction.kt b/espresso/device/java/androidx/test/espresso/device/action/BookModeAction.kt
@@ -18,6 +18,7 @@ package androidx.test.espresso.device.action
 
 import android.content.res.Configuration
 import android.util.Log
+import androidx.test.espresso.device.common.getDeviceApiLevel
 import androidx.test.espresso.device.common.isTestDeviceAnEmulator
 import androidx.test.espresso.device.controller.DeviceControllerOperationException
 import androidx.test.espresso.device.controller.DeviceMode
@@ -42,9 +43,10 @@ internal class BookModeAction() :
       )
     } else if (super.foldingFeatureOrientation != FoldingFeature.Orientation.VERTICAL) {
       Log.d(TAG, "FoldingFeature orientation needs to be rotated.")
-      // TODO(b/296910911) On physical devices, changing screen orientation requires the device to
-      // be in FLAT mode. Open the fold, update orientation, and then restore the half-folded state.
-      if (!isTestDeviceAnEmulator()) {
+      // TODO(b/296910911) On certain physical devices, changing screen orientation requires the
+      // device to be in FLAT mode. Open the fold, update orientation, and then restore the
+      // half-folded state.
+      if (!isTestDeviceAnEmulator() && getDeviceApiLevel() < 34) {
         Log.d(TAG, "Temporarily setting device to flat mode so that device can be rotated.")
         BaseSingleFoldDeviceAction(DeviceMode.FLAT, FoldingFeature.State.FLAT)
           .perform(deviceController)

diff --git a/espresso/device/java/androidx/test/espresso/device/action/TabletopModeAction.kt b/espresso/device/java/androidx/test/espresso/device/action/TabletopModeAction.kt
@@ -18,6 +18,7 @@ package androidx.test.espresso.device.action
 
 import android.content.res.Configuration
 import android.util.Log
+import androidx.test.espresso.device.common.getDeviceApiLevel
 import androidx.test.espresso.device.common.isTestDeviceAnEmulator
 import androidx.test.espresso.device.controller.DeviceControllerOperationException
 import androidx.test.espresso.device.controller.DeviceMode
@@ -42,9 +43,10 @@ internal class TabletopModeAction() :
       )
     } else if (super.foldingFeatureOrientation != FoldingFeature.Orientation.HORIZONTAL) {
       Log.d(TAG, "FoldingFeature orientation needs to be rotated.")
-      // TODO(b/296910911) On physical devices, changing screen orientation requires the device to
-      // be in FLAT mode. Open the fold, update orientation, and then restore the half-folded state.
-      if (!isTestDeviceAnEmulator()) {
+      // TODO(b/296910911) On certain physical devices, changing screen orientation requires the
+      // device to be in FLAT mode. Open the fold, update orientation, and then restore the
+      // half-folded state.
+      if (!isTestDeviceAnEmulator() && getDeviceApiLevel() < 34) {
         Log.d(TAG, "Temporarily setting device to flat mode so that device can be rotated.")
         BaseSingleFoldDeviceAction(DeviceMode.FLAT, FoldingFeature.State.FLAT)
           .perform(deviceController)

diff --git a/espresso/device/java/androidx/test/espresso/device/controller/PhysicalDeviceController.kt b/espresso/device/java/androidx/test/espresso/device/controller/PhysicalDeviceController.kt
@@ -81,13 +81,13 @@ class PhysicalDeviceController() : DeviceController {
       )
     }
 
-    // TODO(b/296910911) Support setting screen orientation on folded devices
+    // TODO(b/296910911) Support setting screen orientation on API 33- folded devices
     val supportedDeviceStates = getMapOfDeviceStateNamesToIdentifiers()
-    if (supportedDeviceStates.isNotEmpty()) {
+    if (supportedDeviceStates.isNotEmpty() && getDeviceApiLevel() < 34) {
       val currentDeviceStateIdentifier = executeShellCommand("cmd device_state print-state").trim()
       if (currentDeviceStateIdentifier != getMapOfDeviceStateNamesToIdentifiers().get("OPENED")) {
         throw UnsupportedDeviceOperationException(
-          "Setting screen orientation is not suported on physical foldable devices that are not in flat mode."
+          "Setting screen orientation is not suported on physical foldable devices API 33- that are not in flat mode."
         )
       }
     }

diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD
@@ -2,10 +2,10 @@
 #   Light weight module that contains IdlinResources around concurrent Java APIs
 
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
-load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
-load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
-load("//build_extensions:dackka_test.bzl", "dackka_test")
 load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
 
 package(
     default_applicable_licenses = ["//espresso:license"],

diff --git a/espresso/idling_resource/java/androidx/test/espresso/BUILD b/espresso/idling_resource/java/androidx/test/espresso/BUILD
@@ -2,11 +2,11 @@
 #   Light weight module represents a resources of an application under test which can cause
 #   asynchronous background work to happen during test execution.
 
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
 load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
 load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
-load("//build_extensions:dackka_test.bzl", "dackka_test")
-load("//build_extensions:api_checks.bzl", "api_checks")
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 
 package(
     default_applicable_licenses = ["//espresso:license"],

diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD
@@ -1,8 +1,8 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
 load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
 load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
-load("//build_extensions:dackka_test.bzl", "dackka_test")
-load("//build_extensions:api_checks.bzl", "api_checks")
 
 # Description:
 # Network Idling Resources

diff --git a/espresso/intents/java/androidx/test/espresso/intent/BUILD b/espresso/intents/java/androidx/test/espresso/intent/BUILD
@@ -2,10 +2,10 @@
 #   Common library for testing inter and intra app communication via intents.
 
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
 load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
 load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
-load("//build_extensions:dackka_test.bzl", "dackka_test")
-load("//build_extensions:api_checks.bzl", "api_checks")
 
 licenses(["notice"])
 

diff --git a/espresso/remote/java/androidx/test/espresso/remote/BUILD b/espresso/remote/java/androidx/test/espresso/remote/BUILD
@@ -1,11 +1,11 @@
 # Description:
 #  Remote package for espresso.
 
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 load("//build_extensions:api_checks.bzl", "api_checks")
 load("//build_extensions:dackka_test.bzl", "dackka_test")
 load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
 load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 
 licenses(["notice"])
 

diff --git a/espresso/remote/javatests/androidx/test/espresso/remote/BUILD b/espresso/remote/javatests/androidx/test/espresso/remote/BUILD
@@ -1,11 +1,11 @@
 # Description:
 #   Tests for espresso remote classes
 
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 load(
     "//build_extensions:android_library_test.bzl",
     "axt_android_library_test",
 )
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 
 package(default_applicable_licenses = ["//espresso:license"])
 

diff --git a/espresso/web/java/androidx/test/espresso/web/BUILD b/espresso/web/java/androidx/test/espresso/web/BUILD
@@ -1,8 +1,8 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
 load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
 load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
-load("//build_extensions:dackka_test.bzl", "dackka_test")
-load("//build_extensions:api_checks.bzl", "api_checks")
 
 licenses(["notice"])
 

diff --git a/ext/junit/java/androidx/test/ext/junit/BUILD b/ext/junit/java/androidx/test/ext/junit/BUILD
@@ -1,11 +1,11 @@
 # Description: Build rules for building androidx.test.junit from source
 
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 load("//build_extensions:api_checks.bzl", "api_checks")
 load("//build_extensions:dackka_test.bzl", "dackka_test")
 load("//build_extensions:kt_android_library.bzl", "kt_android_library")
 load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
 load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 
 # all users should reference the equivalent targets in //ext/junit
 package(

diff --git a/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD b/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD
@@ -1,5 +1,5 @@
-load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
 load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
 
 package(default_applicable_licenses = ["//:license"])
 

diff --git a/ext/junit/javatests/androidx/test/ext/junit/runners/BUILD b/ext/junit/javatests/androidx/test/ext/junit/runners/BUILD
@@ -1,5 +1,5 @@
-load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
 load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
 
 package(default_applicable_licenses = ["//:license"])
 

diff --git a/ext/truth/java/androidx/test/ext/truth/BUILD b/ext/truth/java/androidx/test/ext/truth/BUILD
@@ -1,10 +1,10 @@
 # Description: Build rules for building androidx.test.truth from source
 
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 load("//build_extensions:api_checks.bzl", "api_checks")
 load("//build_extensions:dackka_test.bzl", "dackka_test")
 load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
 load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 
 # all users should reference the equivalent targets in //ext/truth
 package(