commit a5a859838ba1f190c441493bca70a4580f8d1e90
author Hyunyoung Song <hyunyoungs@google.com> Wed Aug 09 15:14:01 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 09 15:14:01 2017 +0000
tree 5da242d45a2d344c27fed832c72957ee86c780b3
parent 5660a7dce473e6205d8e3c111a5ff3ff61fbcf77
parent 7c4bd8903885ad25aab6bf18ce961931965aa687

Merge changes from topic 'am-84f3ec58-93f2-4a21-a27f-6d727311e4dc' into ub-launcher3-master

* changes:
  [automerger] Disable adaptive icon drawable parallax effect during drag and drop Bug: 34828147 am: 76bf7f3835
  Disable adaptive icon drawable parallax effect during drag and drop Bug: 34828147

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

diff --git a/go/src_flags/com/android/launcher3/config/FeatureFlags.java b/go/src_flags/com/android/launcher3/config/FeatureFlags.java
index 5bb2ac9..b11bb7c 100644
--- a/go/src_flags/com/android/launcher3/config/FeatureFlags.java
+++ b/go/src_flags/com/android/launcher3/config/FeatureFlags.java
@@ -25,4 +25,5 @@
 
     // Features to control Launcher3Go behavior
     public static final boolean GO_DISABLE_WIDGETS = true;
+    public static final boolean LAUNCHER3_SPRING_ICONS = false;
 }