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
This commit is contained in:
Sunny Goyal
2018-05-10 06:52:02 +00:00
committed by Android (Google) Code Review
@@ -288,7 +288,7 @@ public class DragView extends View {
if (mScaledMaskPath != null) {
mBgSpringDrawable.setColorFilter(mBaseFilter);
mBgSpringDrawable.setColorFilter(mBaseFilter);
mFgSpringDrawable.setColorFilter(mBaseFilter);
mBadge.setColorFilter(mBaseFilter);
}
} else {