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

Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev

Browse Source
This commit is contained in:
George Mount
2014-11-11 15:41:32 +00:00
committed by Android (Google) Code Review
parent 54a5ca1aad 427c64140d
commit 12403b242f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
} }
} }