Merge "Cleanup code related to ag/11035582" into ub-launcher3-rvc-dev (11e36db8) · Commits · e / os / android_packages_apps_Trebuchet

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -162,7 +162,6 @@ public abstract class AbstractLauncherUiTest {
		mLauncher.enableDebugTracing();
		// Avoid double-reporting of Launcher crashes.
		mLauncher.setOnLauncherCrashed(() -> mLauncherPid = 0);
		mLauncher.disableSensorRotation();
		}

		protected final LauncherActivityRule mActivityMonitor = new LauncherActivityRule();
		@@ -278,7 +277,6 @@ public abstract class AbstractLauncherUiTest {
		clearPackageData(mDevice.getLauncherPackageName());
		mLauncher.enableDebugTracing();
		mLauncherPid = mLauncher.getPid();
		mLauncher.disableSensorRotation();
		}
		}

+2 −3

Original line number	Diff line number	Diff line
		@@ -248,8 +248,6 @@ public final class LauncherInstrumentation {
		}
		}
		}

		disableSensorRotation();
		}

		public void enableCheckEventsForSuccessfulGestures() {
		@@ -1266,7 +1264,7 @@ public final class LauncherInstrumentation {
		TestProtocol.TEST_INFO_RESPONSE_FIELD);
		}

		public void disableSensorRotation() {
		private void disableSensorRotation() {
		getTestInfo(TestProtocol.REQUEST_MOCK_SENSOR_ROTATION);
		}

		@@ -1307,6 +1305,7 @@ public final class LauncherInstrumentation {

		public Closable eventsCheck() {
		Assert.assertTrue("Nested event checking", !sCheckingEvents);
		disableSensorRotation();
		sCheckingEvents = true;
		mExpectedPid = getPid();
		if (sEventChecker == null) sEventChecker = new LogEventChecker();