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

Merge "Bug 5244365 - Prevent views from receiving multiple onAttachedToWindow calls."

Browse Source
This commit is contained in:
Adam Powell
2011-09-16 13:44:35 -07:00
committed by Android (Google) Code Review
parent 0db4bdb24d 4b86788003
commit 0dcb3a6dea
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/view/ViewGroup.java
View File

@@ -289,6 +289,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
*/ */
private static final int FLAG_SPLIT_MOTION_EVENTS = 0x200000; private static final int FLAG_SPLIT_MOTION_EVENTS = 0x200000;
/**
* When set, this ViewGroup will not dispatch onAttachedToWindow calls
* to children when adding new views. This is used to prevent multiple
* onAttached calls when a ViewGroup adds children in its own onAttached method.
*/
private static final int FLAG_PREVENT_DISPATCH_ATTACHED_TO_WINDOW = 0x400000;
/** /**
* Indicates which types of drawing caches are to be kept in memory. * Indicates which types of drawing caches are to be kept in memory.
* This field should be made private, so it is hidden from the SDK. * This field should be made private, so it is hidden from the SDK.
@@ -2154,8 +2161,12 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
*/ */
@Override @Override
void dispatchAttachedToWindow(AttachInfo info, int visibility) { void dispatchAttachedToWindow(AttachInfo info, int visibility) {
mGroupFlags |= FLAG_PREVENT_DISPATCH_ATTACHED_TO_WINDOW;
super.dispatchAttachedToWindow(info, visibility); super.dispatchAttachedToWindow(info, visibility);
mGroupFlags &= ~FLAG_PREVENT_DISPATCH_ATTACHED_TO_WINDOW;
visibility |= mViewFlags & VISIBILITY_MASK; visibility |= mViewFlags & VISIBILITY_MASK;
final int count = mChildrenCount; final int count = mChildrenCount;
final View[] children = mChildren; final View[] children = mChildren;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
@@ -3321,7 +3332,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
} }
AttachInfo ai = mAttachInfo; AttachInfo ai = mAttachInfo;
if (ai != null) { if (ai != null && (mGroupFlags & FLAG_PREVENT_DISPATCH_ATTACHED_TO_WINDOW) == 0) {
boolean lastKeepOn = ai.mKeepScreenOn; boolean lastKeepOn = ai.mKeepScreenOn;
ai.mKeepScreenOn = false; ai.mKeepScreenOn = false;
child.dispatchAttachedToWindow(mAttachInfo, (mViewFlags&VISIBILITY_MASK)); child.dispatchAttachedToWindow(mAttachInfo, (mViewFlags&VISIBILITY_MASK));