Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev (12403b24) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewGroup.java

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2582,15 +2582,21 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
	* Returns true if this ViewGroup should be considered as a single entity for removal		* Returns true if this ViewGroup should be considered as a single entity for removal
	* when executing an Activity transition. If this is false, child elements will move		* when executing an Activity transition. If this is false, child elements will move
	* individually during the transition.		* individually during the transition.
			*
	* @return True if the ViewGroup should be acted on together during an Activity transition.		* @return True if the ViewGroup should be acted on together during an Activity transition.
	* The default value is false when the background is null and true when the background		* The default value is true when there is a non-null background or if
	* is not null or if {@link #getTransitionName()} is not null.		* {@link #getTransitionName()} is not null or if a
			* non-null {@link android.view.ViewOutlineProvider} other than
			* {@link android.view.ViewOutlineProvider#BACKGROUND} was given to
			* {@link #setOutlineProvider(ViewOutlineProvider)} and false otherwise.
	*/		*/
	public boolean isTransitionGroup() {		public boolean isTransitionGroup() {
	if ((mGroupFlags & FLAG_IS_TRANSITION_GROUP_SET) != 0) {		if ((mGroupFlags & FLAG_IS_TRANSITION_GROUP_SET) != 0) {
	return ((mGroupFlags & FLAG_IS_TRANSITION_GROUP) != 0);		return ((mGroupFlags & FLAG_IS_TRANSITION_GROUP) != 0);
	} else {		} else {
	return getBackground() != null \|\| getTransitionName() != null;		final ViewOutlineProvider outlineProvider = getOutlineProvider();
			return getBackground() != null \|\| getTransitionName() != null \|\|
			(outlineProvider != null && outlineProvider != ViewOutlineProvider.BACKGROUND);
	}		}
	}		}