commit 599752ed811d9e0a0e5764f3eff62c033bd91948
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jan 19 01:32:07 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 19 01:32:07 2018 +0000
tree 800dc7f85ddca7e58d02ae50871c31ae67d4e3d1
parent 6682318dc70942100e33f76ac64afaa9d99a7992
parent b3335da9abf3fe4ea866753bc111ceaa2cb034b6

Merge "Only move AllAppsContainerView when opening apps from All Apps." into ub-launcher3-master

src/com/android/launcher3/allapps/DiscoveryBounce.java

diff --git a/src/com/android/launcher3/allapps/DiscoveryBounce.java b/src/com/android/launcher3/allapps/DiscoveryBounce.java
index 550fcf9..fddafb2 100644
--- a/src/com/android/launcher3/allapps/DiscoveryBounce.java
+++ b/src/com/android/launcher3/allapps/DiscoveryBounce.java
@@ -21,6 +21,8 @@
 import android.animation.Animator;
 import android.animation.AnimatorInflater;
 import android.animation.AnimatorListenerAdapter;
+import android.app.ActivityManager;
+import android.content.Context;
 import android.view.MotionEvent;
 
 import com.android.launcher3.AbstractFloatingView;
@@ -98,7 +100,8 @@
         if (!launcher.isInState(NORMAL)
                 || launcher.getSharedPrefs().getBoolean(APPS_VIEW_SHOWN, false)
                 || AbstractFloatingView.getTopOpenView(launcher) != null
-                || UserManagerCompat.getInstance(launcher).isDemoUser()) {
+                || UserManagerCompat.getInstance(launcher).isDemoUser()
+                || ActivityManager.isRunningInTestHarness()) {
             return;
         }