commit 59c3b1cf04e074c4322fe3324dc120e4f3d1e841
author Andy Wickham <awickham@google.com> Mon Jul 26 20:16:12 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 26 20:16:12 2021 +0000
tree 7f4c6764873b0ae155585abf2a9a81a8d961d489
parent 38dad54d80cb5d93b16eedcb115865051268ec8e
parent 6c482bc9e1928a90a7dbf7faf543aa979d215f01

Merge "Doesn't scale PagedView snap speed during tests." into sc-v2-dev am: 075c50e0c6 am: 6c482bc9e1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15373287

Change-Id: If09fab150342854d2bd3573b501032bc0e888573

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 74b0d9c..3f7a3ad 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1614,7 +1614,7 @@
             return false;
         }
 
-        if (FeatureFlags.IS_STUDIO_BUILD) {
+        if (FeatureFlags.IS_STUDIO_BUILD && !Utilities.IS_RUNNING_IN_TEST_HARNESS) {
             duration *= Settings.Global.getFloat(getContext().getContentResolver(),
                     Settings.Global.WINDOW_ANIMATION_SCALE, 1);
         }