Merge "Avoid race condition during grayscale animation of QS tile" am: bceee1cbb4

am: 36f27fa6f8

Change-Id: I7d7d9b811a08c68403e7a7539793cc4af226571e

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java

@@ -439,15 +439,22 @@ public abstract class QSTileImpl<TState extends State> implements QSTile {
 
     public static class DrawableIcon extends Icon {
         protected final Drawable mDrawable;
+        protected final Drawable mInvisibleDrawable;
 
         public DrawableIcon(Drawable drawable) {
             mDrawable = drawable;
+            mInvisibleDrawable = drawable.getConstantState().newDrawable();
         }
 
         @Override
         public Drawable getDrawable(Context context) {
             return mDrawable;
         }
+
+        @Override
+        public Drawable getInvisibleDrawable(Context context) {
+            return mInvisibleDrawable;
+        }
     }
 
     public static class DrawableIconWithRes extends DrawableIcon {