| commit | b4ea0d0d1d7e77ee39bf58e818a57351d86b1a65 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Nov 05 20:18:04 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 05 20:18:04 2021 +0000 |
| tree | 878dfed99ec7a2ef11da15deb7366b4ab8fe720d | |
| parent | 82a7d3424d79155771d6d99b56cec5df0d1330fb [diff] | |
| parent | d25e0fb3c3b28e1a0ff0708f22084ab0b01d8bb1 [diff] |
Merge "Allowing OOP tests to enable home screen rotation." into sc-v2-dev am: d25e0fb3c3 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16198841 Change-Id: Ica6a257d8210f9a5d00fada1a9904bfb3e6895bd
diff --git a/src/com/android/launcher3/testing/TestInformationHandler.java b/src/com/android/launcher3/testing/TestInformationHandler.java index 17d925c..8ebfd62 100644 --- a/src/com/android/launcher3/testing/TestInformationHandler.java +++ b/src/com/android/launcher3/testing/TestInformationHandler.java
@@ -157,6 +157,12 @@ return response; } + case TestProtocol.REQUEST_ENABLE_ROTATION: + MAIN_EXECUTOR.submit(() -> + Launcher.ACTIVITY_TRACKER.getCreatedActivity().getRotationHelper() + .forceAllowRotationForTesting(Boolean.parseBoolean(arg))); + return null; + default: return null; }
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index 91c7221..9a74fb1 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -108,6 +108,7 @@ "get-focused-task-height-for-tablet"; public static final String REQUEST_GET_GRID_TASK_SIZE_RECT_FOR_TABLET = "get-grid-task-size-rect-for-tablet"; + public static final String REQUEST_ENABLE_ROTATION = "enable_rotation"; public static Long sForcePauseTimeout; public static final String REQUEST_SET_FORCE_PAUSE_TIMEOUT = "set-force-pause-timeout";
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index e2d0238..5a807ca 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -350,6 +350,10 @@ getTestInfo(TestProtocol.REQUEST_SET_FORCE_PAUSE_TIMEOUT, Long.toString(timeout)); } + public void setEnableRotation(boolean on) { + getTestInfo(TestProtocol.REQUEST_ENABLE_ROTATION, Boolean.toString(on)); + } + public boolean hadNontestEvents() { return getTestInfo(TestProtocol.REQUEST_GET_HAD_NONTEST_EVENTS) .getBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD);