commit 0a71ee4e537ca9d56b7c7089f989481d6b8a2ce5
author Sunny Goyal <sunnygoyal@google.com> Thu May 10 06:52:02 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 10 06:52:02 2018 +0000
tree 98244bdd2ed135022bd97357e0c3894427d254ab
parent f4267ff9d2d5ab567b2a535aff3ff97bbf3322c9
parent 56cbbcbe705e0c516dc32d687d2fd30fd28c0f44

Merge changes from topic "am-b652fda1-3023-4149-b53e-2532167ad664" into ub-launcher3-master

* changes:
  [automerger] Fixing disabled filter is not applied to the foregound layer when dragging an icon am: b6d292d788
  Fixing disabled filter is not applied to the foregound layer when dragging an icon

src/com/android/launcher3/dragndrop/DragView.java

diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index e1e1f83..1e5f854 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -288,7 +288,7 @@
 
             if (mScaledMaskPath != null) {
                 mBgSpringDrawable.setColorFilter(mBaseFilter);
-                mBgSpringDrawable.setColorFilter(mBaseFilter);
+                mFgSpringDrawable.setColorFilter(mBaseFilter);
                 mBadge.setColorFilter(mBaseFilter);
             }
         } else {