Merge branch 'master' into develop

blipinsk · Apr 4, 2016 · a9d7999 · a9d7999
2 parents c071513 + c8b78c1
commit a9d7999
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.../main/java/com/bartoszlipinski/viewpropertyobjectanimator/ViewPropertyObjectAnimator.java b/.../main/java/com/bartoszlipinski/viewpropertyobjectanimator/ViewPropertyObjectAnimator.java
@@ -23,6 +23,7 @@
 import android.annotation.SuppressLint;
 import android.os.Build;
 import android.support.v4.util.ArrayMap;
+import android.support.v4.view.ViewCompat;
 import android.util.Property;
 import android.view.View;
 import android.view.animation.Interpolator;
@@ -823,7 +824,7 @@ public void onAnimationStart(Animator animation) {
                             View view = mView.get();
                             mCurrentLayerType = view.getLayerType();
                             view.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-                            if(view.isAttachedToWindow()) {
+                            if(ViewCompat.isAttachedToWindow(view)) {
                                 view.buildLayer();
                             }
                         }