Fix startPostponedEnterTransition being called too early.
Bug: 174811491 Test: consecutive screenshot to share actions Change-Id: Ieb6db02948e22c3a30a0874e0fb5881d249f8641
This commit is contained in:
committed by
Jonathan Miranda
parent
852446ad48
commit
9d85fd4d10
@@ -431,19 +431,22 @@ public class ChooserActivity extends ResolverActivity implements
|
||||
}
|
||||
|
||||
private void maybeHideContentPreview() {
|
||||
if (!mAtLeastOneLoaded && mHideParentOnFail) {
|
||||
Log.i(TAG, "Hiding image preview area. Timed out waiting for preview to load"
|
||||
+ " within " + mImageLoadTimeoutMillis + "ms.");
|
||||
collapseParentView();
|
||||
if (shouldShowTabs()) {
|
||||
hideStickyContentPreview();
|
||||
} else if (mChooserMultiProfilePagerAdapter.getCurrentRootAdapter() != null) {
|
||||
mChooserMultiProfilePagerAdapter.getCurrentRootAdapter().hideContentPreview();
|
||||
if (!mAtLeastOneLoaded) {
|
||||
if (mHideParentOnFail) {
|
||||
Log.i(TAG, "Hiding image preview area. Timed out waiting for preview to load"
|
||||
+ " within " + mImageLoadTimeoutMillis + "ms.");
|
||||
collapseParentView();
|
||||
if (shouldShowTabs()) {
|
||||
hideStickyContentPreview();
|
||||
} else if (mChooserMultiProfilePagerAdapter.getCurrentRootAdapter() != null) {
|
||||
mChooserMultiProfilePagerAdapter.getCurrentRootAdapter()
|
||||
.hideContentPreview();
|
||||
}
|
||||
mHideParentOnFail = false;
|
||||
}
|
||||
mHideParentOnFail = false;
|
||||
mRemoveSharedElements = true;
|
||||
startPostponedEnterTransition();
|
||||
}
|
||||
mRemoveSharedElements = true;
|
||||
startPostponedEnterTransition();
|
||||
}
|
||||
|
||||
private void collapseParentView() {
|
||||
|
||||
Reference in New Issue
Block a user