Merge "The source of subtree chagnes should be the viewParent" (0dd1be75) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -13386,10 +13386,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

	if ((mPrivateFlags2 & PFLAG2_SUBTREE_ACCESSIBILITY_STATE_CHANGED) == 0) {		if ((mPrivateFlags2 & PFLAG2_SUBTREE_ACCESSIBILITY_STATE_CHANGED) == 0) {
	mPrivateFlags2 \|= PFLAG2_SUBTREE_ACCESSIBILITY_STATE_CHANGED;		mPrivateFlags2 \|= PFLAG2_SUBTREE_ACCESSIBILITY_STATE_CHANGED;
	if (mParent != null) {		if (mParent != null && mParent instanceof View) {
	try {		try {
	mParent.notifySubtreeAccessibilityStateChanged(		mParent.notifySubtreeAccessibilityStateChanged(
	this, this, AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);		this, (View) mParent, AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
	} catch (AbstractMethodError e) {		} catch (AbstractMethodError e) {
	Log.e(VIEW_LOG_TAG, mParent.getClass().getSimpleName() +		Log.e(VIEW_LOG_TAG, mParent.getClass().getSimpleName() +
	" does not fully implement ViewParent", e);		" does not fully implement ViewParent", e);

core/java/android/view/ViewGroup.java

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -5144,7 +5144,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
	}		}

	if (child.getVisibility() != View.GONE) {		if (child.getVisibility() != View.GONE) {
	notifySubtreeAccessibilityStateChangedIfNeeded();		child.notifySubtreeAccessibilityStateChangedIfNeeded();
	}		}

	if (mTransientIndices != null) {		if (mTransientIndices != null) {
	@@ -5432,7 +5432,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
	dispatchViewRemoved(view);		dispatchViewRemoved(view);

	if (view.getVisibility() != View.GONE) {		if (view.getVisibility() != View.GONE) {
	notifySubtreeAccessibilityStateChangedIfNeeded();		view.notifySubtreeAccessibilityStateChangedIfNeeded();
	}		}

	int transientCount = mTransientIndices == null ? 0 : mTransientIndices.size();		int transientCount = mTransientIndices == null ? 0 : mTransientIndices.size();
	@@ -5740,7 +5740,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
	}		}
	dispatchVisibilityAggregated(isAttachedToWindow() && getWindowVisibility() == VISIBLE		dispatchVisibilityAggregated(isAttachedToWindow() && getWindowVisibility() == VISIBLE
	&& isShown());		&& isShown());
	notifySubtreeAccessibilityStateChangedIfNeeded();		child.notifySubtreeAccessibilityStateChangedIfNeeded();
	}		}

	/**		/**
	@@ -6146,7 +6146,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
	if (invalidate) {		if (invalidate) {
	invalidateViewProperty(false, false);		invalidateViewProperty(false, false);
	}		}
	notifySubtreeAccessibilityStateChangedIfNeeded();		notifySubtreeAccessibilityStateChanged(
			this, this, AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
	}		}

	@Override		@Override

core/java/android/widget/AdapterView.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1106,7 +1106,8 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup {
	checkSelectionChanged();		checkSelectionChanged();
	}		}

	notifySubtreeAccessibilityStateChangedIfNeeded();		notifySubtreeAccessibilityStateChanged(
			this, this, AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
	}		}

	/**		/**