Merge pull request #92 from Hitta/canvas-restore-android-m-api-23-fix

Avoid calling canvas.restore on Android M
traex · Feb 24, 2016 · df5f9e4 · jqyp324 · Feb 17, 2017 · df5f9e4
2 parents 241a8d0 + 82cf00e
commit df5f9e4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/library/src/main/java/com/andexert/library/RippleView.java b/library/src/main/java/com/andexert/library/RippleView.java
@@ -33,6 +33,7 @@
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
+import android.os.Build;
 import android.os.Handler;
 import android.support.annotation.ColorRes;
 import android.util.AttributeSet;
@@ -164,7 +165,11 @@ public void draw(Canvas canvas) {
                 timer = 0;
                 durationEmpty = -1;
                 timerEmpty = 0;
-                canvas.restore();
+                // There is problem on Android M where canvas.restore() seems to be called automatically
+                // For now, don't call canvas.restore() manually on Android M (API 23)
+                if(Build.VERSION.SDK_INT != 23) {
+                    canvas.restore();
+                }
                 invalidate();
                 if (onCompletionListener != null) onCompletionListener.onComplete(this);
                 return;