commit 56cbbcbe705e0c516dc32d687d2fd30fd28c0f44
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed May 09 21:25:16 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed May 09 21:25:16 2018 +0000
tree 3c5aa5f916e00dd3ce6daf25c86ef65978571724
parent 37b4fe8930f74fa630ac84bcfeecad2188fb9d71
parent b6d292d788189f1fe690987d2f67a2be8d35fd8a

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

Change-Id: I790b1e856eb57f4678c30cd0d60ed7967f3c46c1

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 {