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

Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev

Browse Source
This commit is contained in:
George Mount
2014-10-31 21:30:20 +00:00
committed by Android (Google) Code Review
parent b9eabc5c2b 1fb941dd4f
commit fa21e75734
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/app/EnterTransitionCoordinator.java
View File

@@ -133,16 +133,17 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
return; return;
} }
mAreViewsReady = true; mAreViewsReady = true;
final ViewGroup decor = getDecor();
// Ensure the views have been laid out before capturing the views -- we need the epicenter. // Ensure the views have been laid out before capturing the views -- we need the epicenter.
if (sharedElements.isEmpty() || !sharedElements.valueAt(0).isLayoutRequested()) { if (decor == null || (decor.isAttachedToWindow() &&
(sharedElements.isEmpty() || !sharedElements.valueAt(0).isLayoutRequested()))) {
viewsReady(sharedElements); viewsReady(sharedElements);
} else { } else {
final View sharedElement = sharedElements.valueAt(0); decor.getViewTreeObserver()
sharedElement.getViewTreeObserver()
.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() { .addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
@Override @Override
public boolean onPreDraw() { public boolean onPreDraw() {
sharedElement.getViewTreeObserver().removeOnPreDrawListener(this); decor.getViewTreeObserver().removeOnPreDrawListener(this);
viewsReady(sharedElements); viewsReady(sharedElements);
return true; return true;
} }