summaryrefslogtreecommitdiffstats
path: root/core/java/android/view
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-05-25 04:39:37 -0700
committerRomain Guy <romainguy@android.com>2009-05-25 04:39:37 -0700
commitec25df9fbc685be384f8dd764fa224a4d923e9d8 (patch)
tree3d8c42a50b2286c7dc032f111da52971ff31cb99 /core/java/android/view
parentff686ce11e952a9001b1384d8e7d82127b0529a2 (diff)
downloadframeworks_base-ec25df9fbc685be384f8dd764fa224a4d923e9d8.zip
frameworks_base-ec25df9fbc685be384f8dd764fa224a4d923e9d8.tar.gz
frameworks_base-ec25df9fbc685be384f8dd764fa224a4d923e9d8.tar.bz2
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.
Diffstat (limited to 'core/java/android/view')
-rw-r--r--core/java/android/view/ViewGroup.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index c6f36a0..8b0629c 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;