diff options
| -rw-r--r-- | core/java/com/android/internal/app/ChooserActivity.java | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index e06413783fe4..34e03af4c666 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -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() { |