summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-10-04 19:30:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-10-04 19:30:51 +0000
commitbb24884801320d7e70528a4258bd76896f37b9b8 (patch)
tree2afd2b421ca406d7112edab7b7fcdf90893a2b85 /tests
parent18cc85844505ea297e3df14b5977e3fc3ba205a9 (diff)
parent5ec12a5d3af94bbe00f87de776d0106291055536 (diff)
downloadandroid_packages_apps_Trebuchet-bb24884801320d7e70528a4258bd76896f37b9b8.tar.gz
android_packages_apps_Trebuchet-bb24884801320d7e70528a4258bd76896f37b9b8.tar.bz2
android_packages_apps_Trebuchet-bb24884801320d7e70528a4258bd76896f37b9b8.zip
Merge "Disable ShortcutsLaunchTest.testAppLauncher*" into ub-launcher3-master
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java b/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java
index f8a7bf79e..83a6734f2 100644
--- a/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java
+++ b/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java
@@ -17,6 +17,7 @@ import com.android.launcher3.util.Condition;
import com.android.launcher3.util.Wait;
import com.android.launcher3.util.rule.ShellCommandRule;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,12 +32,14 @@ public class ShortcutsLaunchTest extends AbstractLauncherUiTest {
@Rule public ShellCommandRule mDefaultLauncherRule = ShellCommandRule.setDefaultLauncher();
@Test
+ @Ignore
public void testAppLauncher_portrait() throws Exception {
lockRotation(true);
performTest();
}
@Test
+ @Ignore
public void testAppLauncher_landscape() throws Exception {
lockRotation(false);
performTest();