| commit | eba17ec2ac96db0df24720501a72620994adfabb | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 12 22:28:04 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 12 22:28:04 2019 +0000 |
| tree | 00dcbe91ca992cf21325e6dbda2e9fa46464256e | |
| parent | c255c8b357a95a8be9dbfb2aca48002f203de14d [diff] | |
| parent | fa058473d2dbb1ffcbb5723245f7011c07b3d186 [diff] |
Merge "Change default icons for launcher [1/3]" into ub-launcher3-qt-dev
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 9e77937..4a9df98 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -163,6 +163,8 @@ public void setUp() throws Exception { mTargetContext = InstrumentationRegistry.getTargetContext(); mTargetPackage = mTargetContext.getPackageName(); + // Unlock the phone + mDevice.executeShellCommand("input keyevent 82"); } @After
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 08f2681..cde68f2 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -154,8 +154,6 @@ } catch (IOException e) { fail(e.toString()); } - - assertTrue("Phone is locked", !hasSystemUiObject("keyguard_status_view")); } Context getContext() {