diff options
| author | Tony Wickham <twickham@google.com> | 2016-04-07 01:24:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-07 01:24:14 +0000 |
| commit | 5b9a6e3f399e645bfcd7e5a1cd74753309fad1c8 (patch) | |
| tree | add2b0c8322d398f566c1ff48d6170c269106617 /src/com/android/launcher3/CellLayout.java | |
| parent | 3b21a970795e32de46a92de227e91b9efa1f6478 (diff) | |
| parent | 33326074b18cbcea8a6cc282659817845776a06d (diff) | |
| download | android_packages_apps_Trebuchet-5b9a6e3f399e645bfcd7e5a1cd74753309fad1c8.tar.gz android_packages_apps_Trebuchet-5b9a6e3f399e645bfcd7e5a1cd74753309fad1c8.tar.bz2 android_packages_apps_Trebuchet-5b9a6e3f399e645bfcd7e5a1cd74753309fad1c8.zip | |
Merge "Stop animating highlighted page border in spring-loaded mode." into ub-launcher3-calgary
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
| -rw-r--r-- | src/com/android/launcher3/CellLayout.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 51ee47aee..baf5e1f11 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. |