commit 17ad86b1bd4e0d1c83ed9900f671951dc0e9ec01
author Hyunyoung Song <hyunyoungs@google.com> Thu Jun 15 17:30:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 15 17:30:17 2017 +0000
tree 79f7fa6d61ca9ba6895837a7f4968d06104b814b
parent a729006c4cf2ba3b7b23c7a02e38808a6a54252b
parent 1153e9eb89154f94f3d1e3c6df446d15f401cc46

Merge "Add LAUNCHER3_SPRING_ICONS feature flag b/34841763" into ub-launcher3-dorval-polish
am: 1153e9eb89

Change-Id: I905acca335e99f0fe2fe7b0c750766d052665b02

src_flags/com/android/launcher3/config/FeatureFlags.java

diff --git a/src_flags/com/android/launcher3/config/FeatureFlags.java b/src_flags/com/android/launcher3/config/FeatureFlags.java
index ed169b6..40200c5 100644
--- a/src_flags/com/android/launcher3/config/FeatureFlags.java
+++ b/src_flags/com/android/launcher3/config/FeatureFlags.java
@@ -42,6 +42,8 @@
     public static boolean LAUNCHER3_GRADIENT_ALL_APPS = true;
     // When enabled allows use of physics based motions in the Launcher.
     public static boolean LAUNCHER3_PHYSICS = true;
+    // When enabled allows use of spring motions on the icons.
+    public static boolean LAUNCHER3_SPRING_ICONS = true;
 
     // Feature flag to enable moving the QSB on the 0th screen of the workspace.
     public static final boolean QSB_ON_FIRST_SCREEN = true;