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

Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev

Browse Source
This commit is contained in:
George Mount
2014-09-10 21:47:57 +00:00
committed by Android (Google) Code Review
parent bebc56209d 7fa7da221e
commit 05c4f7ad76
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,11 +136,12 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
if (sharedElements.isEmpty() || !sharedElements.valueAt(0).isLayoutRequested()) {
viewsReady(sharedElements);
} else {
sharedElements.valueAt(0).getViewTreeObserver()
final View sharedElement = sharedElements.valueAt(0);
sharedElement.getViewTreeObserver()
.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
@Override
public boolean onPreDraw() {
sharedElements.valueAt(0).getViewTreeObserver().removeOnPreDrawListener(this);
sharedElement.getViewTreeObserver().removeOnPreDrawListener(this);
viewsReady(sharedElements);
return true;
}