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

Fix refactoring of invalidate methods

Browse Source 
Was incorrectly clearing the DRAWN flag and updating mLastIsOpaque from
partial invalidations, though why this should be different is somewhat
of a mystery.

BUG: 13138721
Change-Id: Ic8d11a64406bc78e94adec7355c1f50d87567887
This commit is contained in:
Alan Viverette
2014-02-21 16:48:17 -08:00
parent 4418372b21
commit 550267f72b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11517,7 +11517,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
}
void invalidateInternal(int l, int t, int r, int b, boolean invalidateCache,
boolean checkOpaque) {
boolean fullInvalidate) {
if (skipInvalidate()) {
return;
}
@@ -11525,9 +11525,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
if ((mPrivateFlags & (PFLAG_DRAWN | PFLAG_HAS_BOUNDS)) == (PFLAG_DRAWN | PFLAG_HAS_BOUNDS)
|| (invalidateCache && (mPrivateFlags & PFLAG_DRAWING_CACHE_VALID) == PFLAG_DRAWING_CACHE_VALID)
|| (mPrivateFlags & PFLAG_INVALIDATED) != PFLAG_INVALIDATED
|| (checkOpaque && isOpaque() != mLastIsOpaque)) {
mLastIsOpaque = isOpaque();
mPrivateFlags &= ~PFLAG_DRAWN;
|| (fullInvalidate && isOpaque() != mLastIsOpaque)) {
if (fullInvalidate) {
mLastIsOpaque = isOpaque();
mPrivateFlags &= ~PFLAG_DRAWN;
}
mPrivateFlags |= PFLAG_DIRTY;
if (invalidateCache) {