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

am c452d4c9: Merge "Improve Visibility parent value check." into lmp-dev

Browse Source 
* commit 'c452d4c91358b97ef996eca624a081c4ad9547f2':
  Improve Visibility parent value check.
This commit is contained in:
George Mount
2014-09-08 14:08:22 +00:00
committed by Android Git Automerger
parent 785ff7730f 24e08d0692
commit 0f70d97651
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/transition/Visibility.java
View File

@@ -358,12 +358,16 @@ public abstract class Visibility extends Transition {
overlayView = startView;
} else if (startView.getParent() instanceof View) {
View startParent = (View) startView.getParent();
if (!isValidTarget(startParent)) {
if (startView.isAttachedToWindow()) {
overlayView = copyViewImage(startView);
} else {
overlayView = startView;
}
VisibilityInfo parentVisibilityInfo = null;
TransitionValues endParentValues = getMatchedTransitionValues(startParent,
true);
if (endParentValues != null) {
TransitionValues startParentValues = getTransitionValues(startParent, true);
parentVisibilityInfo =
getVisibilityChangeInfo(startParentValues, endParentValues);
}
if (parentVisibilityInfo == null || !parentVisibilityInfo.visibilityChange) {
overlayView = copyViewImage(startView);
} else if (startParent.getParent() == null) {
int id = startParent.getId();
if (id != View.NO_ID && sceneRoot.findViewById(id) != null