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

Commit d7573be5 authored by Cyrus Boadway's avatar Cyrus Boadway Committed by Automerger Merge Worker
Browse files

Merge "Keep transparent drawable for clipping outline during launch animation"... 

Merge "Keep transparent drawable for clipping outline during launch animation" into sc-dev am: 66f1b578

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15284080

Change-Id: I065ddc6049008b0a2db9767ab4d1e49e1537efac
parents 02c75d98 66f1b578

quickstep/src/com/android/quickstep/views/FloatingWidgetBackgroundView.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -72,14 +72,20 @@ final class FloatingWidgetBackgroundView extends View { 
            mForegroundProperties.init(

            mForegroundProperties.init(

                    mOriginalForeground.getConstantState().newDrawable().mutate());

                    mOriginalForeground.getConstantState().newDrawable().mutate());

            setForeground(mForegroundProperties.mDrawable);

            setForeground(mForegroundProperties.mDrawable);

            mSourceView.setForeground(null);

            Drawable clipPlaceholder =

                    mOriginalForeground.getConstantState().newDrawable().mutate();

            clipPlaceholder.setAlpha(0);

            mSourceView.setForeground(clipPlaceholder);

        }

        }

        if (isSupportedDrawable(backgroundView.getBackground())) {

        if (isSupportedDrawable(backgroundView.getBackground())) {

            mOriginalBackground = backgroundView.getBackground();

            mOriginalBackground = backgroundView.getBackground();

            mBackgroundProperties.init(

            mBackgroundProperties.init(

                    mOriginalBackground.getConstantState().newDrawable().mutate());

                    mOriginalBackground.getConstantState().newDrawable().mutate());

            setBackground(mBackgroundProperties.mDrawable);

            setBackground(mBackgroundProperties.mDrawable);

            mSourceView.setBackground(null);

            Drawable clipPlaceholder =

                    mOriginalBackground.getConstantState().newDrawable().mutate();

            clipPlaceholder.setAlpha(0);

            mSourceView.setBackground(clipPlaceholder);

        } else if (mOriginalForeground == null) {

        } else if (mOriginalForeground == null) {

            mFallbackDrawable.setColor(fallbackBackgroundColor);

            mFallbackDrawable.setColor(fallbackBackgroundColor);

            setBackground(mFallbackDrawable);

            setBackground(mFallbackDrawable);