commit 5b9a6e3f399e645bfcd7e5a1cd74753309fad1c8
author Tony Wickham <twickham@google.com> Thu Apr 07 01:24:14 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 07 01:24:14 2016 +0000
tree add2b0c8322d398f566c1ff48d6170c269106617
parent 3b21a970795e32de46a92de227e91b9efa1f6478
parent 33326074b18cbcea8a6cc282659817845776a06d

Merge "Stop animating highlighted page border in spring-loaded mode." into ub-launcher3-calgary

src/com/android/launcher3/CellLayout.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 51ee47a..baf5e1f 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -113,7 +113,8 @@
 
     private float mBackgroundAlpha;
 
-    private static final int BACKGROUND_ACTIVATE_DURATION = 120;
+    private static final int BACKGROUND_ACTIVATE_DURATION =
+            FeatureFlags.LAUNCHER3_LEGACY_WORKSPACE_DND ? 120 : 0;
     private final TransitionDrawable mBackground;
 
     // These values allow a fixed measurement to be set on the CellLayout.