Merge "Fix startPostponedEnterTransition being called too early." (41c07458) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserActivity.java

+14 −11

Original line number	Diff line number	Diff line
		@@ -431,20 +431,23 @@ public class ChooserActivity extends ResolverActivity implements
		}

		private void maybeHideContentPreview() {
		if (!mAtLeastOneLoaded && mHideParentOnFail) {
		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();
		mChooserMultiProfilePagerAdapter.getCurrentRootAdapter()
		.hideContentPreview();
		}
		mHideParentOnFail = false;
		}
		mRemoveSharedElements = true;
		startPostponedEnterTransition();
		}
		}

		private void collapseParentView() {
		// This will effectively hide the content preview row by forcing the height