commit 549ccf8d0ac9444254f6529db72dd2f6eadd0de4
author Tony Wickham <twickham@google.com> Thu Apr 07 01:32:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 07 01:32:30 2016 +0000
tree add2b0c8322d398f566c1ff48d6170c269106617
parent 20666195117349aeacccd949ff05fba6f9f28974
parent 5b9a6e3f399e645bfcd7e5a1cd74753309fad1c8

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

* commit '5b9a6e3f399e645bfcd7e5a1cd74753309fad1c8':
  Stop animating highlighted page border in spring-loaded mode.

Change-Id: I4a390976250ad198db1fccf4bd68802e84701a11

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.