summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-12-02 15:19:36 -0800
committerMathias Agopian <mathias@google.com>2010-12-03 17:35:06 -0800
commite33811512eb061338792dbb0dbd37a1b8e4e1079 (patch)
treef0de7fa521b1f3ed082d65249eac10234eb4c2a0
parent1989af22b5aa94430c7a43e13f3307d25be8c837 (diff)
downloadframeworks_base-e33811512eb061338792dbb0dbd37a1b8e4e1079.zip
frameworks_base-e33811512eb061338792dbb0dbd37a1b8e4e1079.tar.gz
frameworks_base-e33811512eb061338792dbb0dbd37a1b8e4e1079.tar.bz2
[3253328, 3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
We only used to check for INVISIBLE, which prevented some Surfaceview optimization to take place. Change-Id: I244b54696d861a022ca1c334ff61ab7efb899587
-rw-r--r--core/java/android/view/ViewGroup.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index b9864ba..2b71b4a 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -3304,7 +3304,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
boolean noneOfTheChildrenAreTransparent = true;
for (int i = 0; i < count; i++) {
final View child = children[i];
- if ((child.mViewFlags & VISIBILITY_MASK) != GONE || child.getAnimation() != null) {
+ if ((child.mViewFlags & VISIBILITY_MASK) == VISIBLE || child.getAnimation() != null) {
if (!child.gatherTransparentRegion(region)) {
noneOfTheChildrenAreTransparent = false;
}