From ec25df9fbc685be384f8dd764fa224a4d923e9d8 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Mon, 25 May 2009 04:39:37 -0700
Subject: [PATCH] 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.

---
 api/current.xml                               | 46 ++++++++++++----
 .../android/gesture/GestureOverlayView.java   | 52 ++++++++++++++-----
 core/java/android/view/ViewGroup.java         |  3 +-
 core/res/res/values/attrs.xml                 |  2 +
 core/res/res/values/public.xml                |  1 +
 5 files changed, 79 insertions(+), 25 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index 94e2bb10d5942..81405899e5d51 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -3518,17 +3518,6 @@
  visibility="public"
 >
 </field>
-<field name="donut_resource_pad33"
- type="int"
- transient="false"
- volatile="false"
- value="16843391"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="donut_resource_pad4"
  type="int"
  transient="false"
@@ -4035,6 +4024,17 @@
  visibility="public"
 >
 </field>
+<field name="fadeEnabled"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843391"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="fadeOffset"
  type="int"
  transient="false"
@@ -46821,6 +46821,17 @@
  visibility="public"
 >
 </method>
+<method name="isFadeEnabled"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="isGesturing"
  return="boolean"
  abstract="false"
@@ -46893,6 +46904,19 @@
 <parameter name="enabled" type="boolean">
 </parameter>
 </method>
+<method name="setFadeEnabled"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="fadeEnabled" type="boolean">
+</parameter>
+</method>
 <method name="setGesture"
  return="void"
  abstract="false"
diff --git a/core/java/android/gesture/GestureOverlayView.java b/core/java/android/gesture/GestureOverlayView.java
index 3476e4d6bac61..4cdbd3ecd999f 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);
             }
         }
     }
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index c6f36a05d4254..8b0629cf2b231 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -2351,7 +2351,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
             final boolean drawAnimation = (child.mPrivateFlags & DRAW_ANIMATION) == DRAW_ANIMATION;
 
             // Check whether the child that requests the invalidate is fully opaque
-            final boolean isOpaque = child.isOpaque();
+            final boolean isOpaque = child.isOpaque() && !drawAnimation &&
+                    child.getAnimation() != null;
             // Mark the child as dirty, using the appropriate flag
             // Make sure we do not set both flags at the same time
             final int opaqueFlag = isOpaque ? DIRTY_OPAQUE : DIRTY;
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index e5fa2c50f30eb..b54802b56f15f 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -2107,6 +2107,8 @@
         <!-- Defines whether the overlay should intercept the motion events when a gesture
              is recognized. -->
         <attr name="eventsInterceptionEnabled" format="boolean" />
+        <!-- Defines whether the gesture will automatically fade out after being recognized. -->
+        <attr name="fadeEnabled" format="boolean" />
     </declare-styleable>
 
     <!-- ======================================= -->
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index e36159d0d17db..621270e8198e5 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1112,6 +1112,7 @@
   <public type="attr" name="gestureStrokeSquarenessThreshold" />
   <public type="attr" name="gestureStrokeAngleThreshold" />
   <public type="attr" name="eventsInterceptionEnabled" />
+  <public type="attr" name="fadeEnabled" />
 
   <public-padding type="attr" name="donut_resource_pad" end="0x0101029f" />