summaryrefslogtreecommitdiffstats
path: root/quickstep
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2019-09-04 17:52:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-09-04 17:52:11 +0000
commit846656f13898a9fe8745a738db922b4e97d8280b (patch)
tree9b454aeb2866262fdb9b855b377900b75ca32ece /quickstep
parent5e893727f893d68d780161cb400f967c126a6839 (diff)
parent0ce38af95762f11f98f892d1d88babfe837dbd2f (diff)
downloadandroid_packages_apps_Trebuchet-846656f13898a9fe8745a738db922b4e97d8280b.tar.gz
android_packages_apps_Trebuchet-846656f13898a9fe8745a738db922b4e97d8280b.tar.bz2
android_packages_apps_Trebuchet-846656f13898a9fe8745a738db922b4e97d8280b.zip
Merge "Enabling debug tracing for all UI tests" into ub-launcher3-qt-qpr1-dev
Diffstat (limited to 'quickstep')
-rw-r--r--quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java1
-rw-r--r--quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java2
2 files changed, 0 insertions, 3 deletions
diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
index edd5011f2..e29552713 100644
--- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
+++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
@@ -118,7 +118,6 @@ public class NavigationModeSwitchRule implements TestRule {
assertTrue("Couldn't set overlay",
setActiveOverlay(prevOverlayPkg, originalMode));
}
- mLauncher.disableDebugTracing();
}
private void evaluateWithThreeButtons() throws Throwable {
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index be8506d83..885fdbf42 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -97,7 +97,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@Test
@PortraitLandscape
public void testOverview() throws Exception {
- mLauncher.enableDebugTracing();
startTestApps();
Overview overview = mLauncher.pressHome().switchToOverview();
assertTrue("Launcher internal state didn't switch to Overview",
@@ -177,7 +176,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
executeOnLauncher(
launcher -> assertEquals("Still have tasks after dismissing all",
0, getTaskCount(launcher)));
- mLauncher.disableDebugTracing();
}
private int getCurrentOverviewPage(Launcher launcher) {