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

Merge "Fix startPostponedEnterTransition being called too early."

Browse Source
This commit is contained in:
Jonathan Miranda
2021-01-12 19:01:13 +00:00
committed by Android (Google) Code Review
parent 963b83ced9 9d85fd4d10
commit 41c074582d
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -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() {