summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/CellLayout.java
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2016-04-04 15:05:49 -0700
committerTony Wickham <twickham@google.com>2016-04-04 15:05:49 -0700
commit33326074b18cbcea8a6cc282659817845776a06d (patch)
treea3961fa8751eb6395425788e8d8333bb838f0e7d /src/com/android/launcher3/CellLayout.java
parent1c1c08899402a78c5f8baed9a8bd3f999c4249d7 (diff)
downloadandroid_packages_apps_Trebuchet-33326074b18cbcea8a6cc282659817845776a06d.tar.gz
android_packages_apps_Trebuchet-33326074b18cbcea8a6cc282659817845776a06d.tar.bz2
android_packages_apps_Trebuchet-33326074b18cbcea8a6cc282659817845776a06d.zip
Stop animating highlighted page border in spring-loaded mode.
It looked weird, because the scrim cutout happens immediately and the border flickered into place shortly after. Bug: 27135377 Change-Id: Iff861db73c438c7dabccd6ed7c4ee38dbeb77ea1
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
-rw-r--r--src/com/android/launcher3/CellLayout.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index af3703314..6426ec287 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -113,7 +113,8 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
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.