Fix drawing bug: opaque invalidations should not be taken into account when the invalidated view is animating. Also add the ability to disable the auto-fade on the GestureOverlayView.

1 files changed, 39 insertions, 13 deletions

diff --git a/core/java/android/gesture/GestureOverlayView.java b/core/java/android/gesture/GestureOverlayView.java
index 3476e4d..4cdbd3e 100755
--- a/core/java/android/gesture/GestureOverlayView.java
+++ b/core/java/android/gesture/GestureOverlayView.java
@@ -40,6 +40,7 @@ import java.util.ArrayList;
  * @attr ref android.R.styleable#GestureOverlayView_eventsInterceptionEnabled
  * @attr ref android.R.styleable#GestureOverlayView_fadeDuration
  * @attr ref android.R.styleable#GestureOverlayView_fadeOffset
+ * @attr ref android.R.styleable#GestureOverlayView_fadeEnabled
  * @attr ref android.R.styleable#GestureOverlayView_gestureStrokeWidth
  * @attr ref android.R.styleable#GestureOverlayView_gestureStrokeAngleThreshold
  * @attr ref android.R.styleable#GestureOverlayView_gestureStrokeLengthThreshold
@@ -62,6 +63,7 @@ public class GestureOverlayView extends FrameLayout {
     private long mFadeOffset = 420;
     private long mFadingStart;
     private boolean mFadingHasStarted;
+    private boolean mFadeEnabled = true;
 
     private int mCurrentColor;
     private int mCertainGestureColor = 0xFFFFFF00;
@@ -146,6 +148,8 @@ public class GestureOverlayView extends FrameLayout {
                 mGestureStrokeSquarenessTreshold);
         mInterceptEvents = a.getBoolean(R.styleable.GestureOverlayView_eventsInterceptionEnabled,
                 mInterceptEvents);
+        mFadeEnabled = a.getBoolean(R.styleable.GestureOverlayView_fadeEnabled,
+                mFadeEnabled);
 
         a.recycle();
 
@@ -238,6 +242,14 @@ public class GestureOverlayView extends FrameLayout {
         mInterceptEvents = enabled;
     }
 
+    public boolean isFadeEnabled() {
+        return mFadeEnabled;
+    }
+
+    public void setFadeEnabled(boolean fadeEnabled) {
+        mFadeEnabled = fadeEnabled;
+    }
+
     public Gesture getGesture() {
         return mCurrentGesture;
     }
@@ -329,12 +341,14 @@ public class GestureOverlayView extends FrameLayout {
     private void clear(boolean animated, boolean fireActionPerformed) {
         setPaintAlpha(255);
         if (animated && mCurrentGesture != null) {
-            mFadingAlpha = 1.0f;
-            mIsFadingOut = true;
-            mFadingHasStarted = false;
-            mFadingOut.fireActionPerformed = fireActionPerformed;
-            removeCallbacks(mFadingOut);
-            mFadingStart = AnimationUtils.currentAnimationTimeMillis() + mFadeOffset;
+            if (mFadeEnabled) {
+                mFadingAlpha = 1.0f;
+                mIsFadingOut = true;
+                mFadingHasStarted = false;
+                mFadingOut.fireActionPerformed = fireActionPerformed;
+                removeCallbacks(mFadingOut);
+                mFadingStart = AnimationUtils.currentAnimationTimeMillis() + mFadeOffset;
+            }
             postDelayed(mFadingOut, mFadeOffset);
         } else {
             mPath.rewind();
@@ -584,6 +598,16 @@ public class GestureOverlayView extends FrameLayout {
         mIsGesturing = false;
     }
 
+    private void fireOnGesturePerformed() {
+        final ArrayList<OnGesturePerformedListener> actionListeners =
+                mOnGesturePerformedListeners;
+        final int count = actionListeners.size();
+        for (int i = 0; i < count; i++) {
+            actionListeners.get(i).onGesturePerformed(GestureOverlayView.this,
+                    mCurrentGesture);
+        }
+    }    
+
     private class FadeOutRunnable implements Runnable {
         boolean fireActionPerformed;
 
@@ -594,13 +618,7 @@ public class GestureOverlayView extends FrameLayout {
 
                 if (duration > mFadeDuration) {
                     if (fireActionPerformed) {
-                        final ArrayList<OnGesturePerformedListener> actionListeners =
-                                mOnGesturePerformedListeners;
-                        final int count = actionListeners.size();
-                        for (int i = 0; i < count; i++) {
-                            actionListeners.get(i).onGesturePerformed(GestureOverlayView.this,
-                                    mCurrentGesture);
-                        }
+                        fireOnGesturePerformed();
                     }
 
                     mIsFadingOut = false;
@@ -618,6 +636,14 @@ public class GestureOverlayView extends FrameLayout {
                 }
 
                 invalidate();
+            } else if (!mFadeEnabled) {
+                fireOnGesturePerformed();
+
+                mIsFadingOut = false;
+                mFadingHasStarted = false;
+                mPath.rewind();
+                mCurrentGesture = null;
+                setPaintAlpha(255);
             }
         }
     }