From 33326074b18cbcea8a6cc282659817845776a06d Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Mon, 4 Apr 2016 15:05:49 -0700 Subject: [PATCH] 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 --- src/com/android/launcher3/CellLayout.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index af37033146..6426ec287a 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.