Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix invalidation bug with INVISIBLE views."

Browse Source
This commit is contained in:
Chet Haase
2011-08-22 15:19:56 -07:00
committed by Android (Google) Code Review
parent 5b3f07da20 a68c5cf8a1
commit 9af1d28082
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/view/View.java
View File

@@ -8087,6 +8087,11 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
ViewDebug.trace(this, ViewDebug.HierarchyTraceType.INVALIDATE);
}
if ((mViewFlags & VISIBILITY_MASK) != VISIBLE && mCurrentAnimation == null) {
// Noop for views which are not visible and which are not running an animation. They
// will not get drawn and they should not set dirty flags as if they will be drawn
return;
}
if ((mPrivateFlags & (DRAWN | HAS_BOUNDS)) == (DRAWN | HAS_BOUNDS) ||
(mPrivateFlags & DRAWING_CACHE_VALID) == DRAWING_CACHE_VALID ||
(mPrivateFlags & INVALIDATED) != INVALIDATED) {
@@ -8130,6 +8135,11 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
ViewDebug.trace(this, ViewDebug.HierarchyTraceType.INVALIDATE);
}
if ((mViewFlags & VISIBILITY_MASK) != VISIBLE && mCurrentAnimation == null) {
// Noop for views which are not visible and which are not running an animation. They
// will not get drawn and they should not set dirty flags as if they will be drawn
return;
}
if ((mPrivateFlags & (DRAWN | HAS_BOUNDS)) == (DRAWN | HAS_BOUNDS) ||
(mPrivateFlags & DRAWING_CACHE_VALID) == DRAWING_CACHE_VALID ||
(mPrivateFlags & INVALIDATED) != INVALIDATED) {
@@ -8182,6 +8192,11 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
ViewDebug.trace(this, ViewDebug.HierarchyTraceType.INVALIDATE);
}
if ((mViewFlags & VISIBILITY_MASK) != VISIBLE && mCurrentAnimation == null) {
// Noop for views which are not visible and which are not running an animation. They
// will not get drawn and they should not set dirty flags as if they will be drawn
return;
}
if ((mPrivateFlags & (DRAWN | HAS_BOUNDS)) == (DRAWN | HAS_BOUNDS) ||
(invalidateCache && (mPrivateFlags & DRAWING_CACHE_VALID) == DRAWING_CACHE_VALID) ||
(mPrivateFlags & INVALIDATED) != INVALIDATED || isOpaque() != mLastIsOpaque) {
@@ -8217,6 +8232,11 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
* @hide
*/
public void fastInvalidate() {
if ((mViewFlags & VISIBILITY_MASK) != VISIBLE && mCurrentAnimation == null) {
// Noop for views which are not visible and which are not running an animation. They
// will not get drawn and they should not set dirty flags as if they will be drawn
return;
}
if ((mPrivateFlags & (DRAWN | HAS_BOUNDS)) == (DRAWN | HAS_BOUNDS) ||
(mPrivateFlags & DRAWING_CACHE_VALID) == DRAWING_CACHE_VALID ||
(mPrivateFlags & INVALIDATED) != INVALIDATED) {