Merge changes from topic "running-in-test-camel" into tm-qpr-dev am: d2d2913812 am: 0c15dabc48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21725479 Change-Id: I3d02a42c2d0bdebc2487def8696d9a489aca7311 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
8ecb5eeb62
23 files changed
+40
-39
No files matched your search
@@ -43,7 +43,7 @@ public class SpringLoadedDragController implements OnAlarmListener {
|
||||
|
||||
private long getEnterSpringLoadHoverTime() {
|
||||
// Some TAPL tests are flaky on Cuttlefish with a low waiting time
|
||||
return Utilities.IS_RUNNING_IN_TEST_HARNESS
|
||||
return Utilities.isRunningInTestHarness()
|
||||
? ENTER_SPRING_LOAD_HOVER_TIME_IN_TEST
|
||||
: ENTER_SPRING_LOAD_HOVER_TIME;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user