commit cc51d2ce1dec6ab8bffc4f494cb6181658b432a3
author Andy Wickham <awickham@google.com> Wed Apr 15 08:06:05 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 15 08:06:05 2020 +0000
tree 22927ec87f44e0896f816f8a0a4aa9068bc62d47
parent e433812907689bf58f1c05688ef17e9ad29ac805
parent 9f7e4342447c5de75ba1e483aab851788cf2c4a3

Merge "Fixes issue where back tutorial animation didn't always appear." into ub-launcher3-rvc-dev

tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 86faddb..a7089fe 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -162,6 +162,7 @@
         mLauncher.enableDebugTracing();
         // Avoid double-reporting of Launcher crashes.
         mLauncher.setOnLauncherCrashed(() -> mLauncherPid = 0);
+        mLauncher.disableSensorRotation();
     }
 
     protected final LauncherActivityRule mActivityMonitor = new LauncherActivityRule();
@@ -277,6 +278,7 @@
             clearPackageData(mDevice.getLauncherPackageName());
             mLauncher.enableDebugTracing();
             mLauncherPid = mLauncher.getPid();
+            mLauncher.disableSensorRotation();
         }
     }
 

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index af22704..84eae2d 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1265,7 +1265,7 @@
                 TestProtocol.TEST_INFO_RESPONSE_FIELD);
     }
 
-    private void disableSensorRotation() {
+    public void disableSensorRotation() {
         getTestInfo(TestProtocol.REQUEST_MOCK_SENSOR_ROTATION);
     }