Merge "Propagate drawable hotspots when duplicate parent state is enabled" into lmp-dev (9ffe8c06) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewGroup.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -5723,6 +5723,28 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		}
		}

		@Override
		public void drawableHotspotChanged(float x, float y) {
		super.drawableHotspotChanged(x, y);

		if ((mGroupFlags & FLAG_NOTIFY_CHILDREN_ON_DRAWABLE_STATE_CHANGE) != 0) {
		if ((mGroupFlags & FLAG_ADD_STATES_FROM_CHILDREN) != 0) {
		throw new IllegalStateException("addStateFromChildren cannot be enabled if a"
		+ " child has duplicateParentState set to true");
		}

		final View[] children = mChildren;
		final int count = mChildrenCount;

		for (int i = 0; i < count; i++) {
		final View child = children[i];
		if ((child.mViewFlags & DUPLICATE_PARENT_STATE) != 0) {
		child.drawableHotspotChanged(x, y);
		}
		}
		}
		}

		@Override
		protected int[] onCreateDrawableState(int extraSpace) {
		if ((mGroupFlags & FLAG_ADD_STATES_FROM_CHILDREN) == 0) {