Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 368670ca authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Fix Chooser enter transition animation" into tm-dev am: 8d5bcaa5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18609372



Change-Id: I2b8fcd21663d7426e6f1bb9b8a7fec16a440af99
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6bbb0bf8 8d5bcaa5

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

+131 −75
Original line number Diff line number Diff line
@@ -300,6 +300,8 @@ public class ChooserActivity extends ResolverActivity implements 


    @VisibleForTesting

    protected ChooserMultiProfilePagerAdapter mChooserMultiProfilePagerAdapter;

    private final EnterTransitionAnimationDelegate mEnterTransitionAnimationDelegate =

            new EnterTransitionAnimationDelegate();



    private boolean mRemoveSharedElements = false;
@@ -383,7 +385,7 @@ public class ChooserActivity extends ResolverActivity implements 
                        // transition animation.

                        getWindow().setWindowAnimations(0);

                    }

                    startPostponedEnterTransition();

                    mEnterTransitionAnimationDelegate.markImagePreviewReady();

                    return true;

                }

            });
@@ -431,7 +433,7 @@ public class ChooserActivity extends ResolverActivity implements 
                    mHideParentOnFail = false;

                }

                mRemoveSharedElements = true;

                startPostponedEnterTransition();

                mEnterTransitionAnimationDelegate.markImagePreviewReady();

            }

        }
@@ -724,7 +726,7 @@ public class ChooserActivity extends ResolverActivity implements 
                mRemoveSharedElements = false;

            }

        });

        postponeEnterTransition();

        mEnterTransitionAnimationDelegate.postponeTransition();

    }



    @Override
@@ -1242,6 +1244,9 @@ public class ChooserActivity extends ResolverActivity implements 
        if (layout != null) {

            adjustPreviewWidth(getResources().getConfiguration().orientation, layout);

        }

        if (previewType != CONTENT_PREVIEW_IMAGE) {

            mEnterTransitionAnimationDelegate.markImagePreviewReady();

        }



        return layout;

    }
@@ -2514,6 +2519,15 @@ public class ChooserActivity extends ResolverActivity implements 
                if (mResolverDrawerLayout == null || gridAdapter == null) {

                    return;

                }

                int offset = calculateDrawerOffset(top, bottom, recyclerView, gridAdapter);

                mResolverDrawerLayout.setCollapsibleHeightReserved(offset);

                mEnterTransitionAnimationDelegate.markOffsetCalculated();

            });

        }

    }



    private int calculateDrawerOffset(

            int top, int bottom, RecyclerView recyclerView, ChooserGridAdapter gridAdapter) {



        final int bottomInset = mSystemWindowInsets != null

                ? mSystemWindowInsets.bottom : 0;
@@ -2534,8 +2548,7 @@ public class ChooserActivity extends ResolverActivity implements 
        if (rowsToShow == 0 && !shouldShowStickyContentPreview()) {

            offset += getResources().getDimensionPixelSize(

                    R.dimen.chooser_max_collapsed_height);

                    mResolverDrawerLayout.setCollapsibleHeightReserved(offset);

                    return;

            return offset;

        }



        View stickyContentPreview = findViewById(R.id.content_preview_container);
@@ -2593,9 +2606,7 @@ public class ChooserActivity extends ResolverActivity implements 
            }

        }



                mResolverDrawerLayout.setCollapsibleHeightReserved(Math.min(offset, bottom - top));

            });

        }

        return Math.min(offset, bottom - top);

    }



    /**
@@ -3930,6 +3941,51 @@ public class ChooserActivity extends ResolverActivity implements 
        }

    }



    /**

     * A helper class to track app's readiness for the scene transition animation.

     * The app is ready when both the image is laid out and the drawer offset is calculated.

     */

    private class EnterTransitionAnimationDelegate implements View.OnLayoutChangeListener {

        private boolean mPreviewReady = false;

        private boolean mOffsetCalculated = false;



        void postponeTransition() {

            postponeEnterTransition();

        }



        void markImagePreviewReady() {

            if (!mPreviewReady) {

                mPreviewReady = true;

                maybeStartListenForLayout();

            }

        }



        void markOffsetCalculated() {

            if (!mOffsetCalculated) {

                mOffsetCalculated = true;

                maybeStartListenForLayout();

            }

        }



        private void maybeStartListenForLayout() {

            if (mPreviewReady && mOffsetCalculated && mResolverDrawerLayout != null) {

                if (mResolverDrawerLayout.isInLayout()) {

                    startPostponedEnterTransition();

                } else {

                    mResolverDrawerLayout.addOnLayoutChangeListener(this);

                    mResolverDrawerLayout.requestLayout();

                }

            }

        }



        @Override

        public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft,

                int oldTop, int oldRight, int oldBottom) {

            v.removeOnLayoutChangeListener(this);

            startPostponedEnterTransition();

        }

    }



    @Override

    protected void maybeLogProfileChange() {

        getChooserActivityLogger().logShareheetProfileChanged();