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

Commit b4a28867 authored by Jon Miranda's avatar Jon Miranda Committed by android-build-merger
Browse files

Merge "Fix bug where rounded corners were being set despite being disabled."... 

Merge "Fix bug where rounded corners were being set despite being disabled." into qt-dev am: 95bc50fa am: b6ce5eb1
am: e51220cd

Change-Id: I4eddd506b463a11aaafb8147158b3842952aaff3
parents 5f25789b e51220cd

quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java

+4 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS; 
import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;

import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;

import static com.android.systemui.shared.system.QuickStepContract.getWindowCornerRadius;

import static com.android.systemui.shared.system.QuickStepContract.supportsRoundedCornersOnWindows;

import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;

import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;
@@ -495,6 +496,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans 
            endCrop = windowTargetBounds.height();

        }



        final float initialWindowRadius = supportsRoundedCornersOnWindows(mLauncher.getResources())

                ? startCrop / 2f : 0f;

        final float windowRadius = mDeviceProfile.isMultiWindowMode

                ? 0 : getWindowCornerRadius(mLauncher.getResources());

        appAnimator.addUpdateListener(new MultiValueUpdateListener() {
@@ -506,7 +509,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans 
                    alphaDuration, LINEAR);

            FloatProp mCroppedSize = new FloatProp(startCrop, endCrop, 0, CROP_DURATION,

                    EXAGGERATED_EASE);

            FloatProp mWindowRadius = new FloatProp(startCrop / 2f, windowRadius, 0,

            FloatProp mWindowRadius = new FloatProp(initialWindowRadius, windowRadius, 0,

                    RADIUS_DURATION, EXAGGERATED_EASE);



            @Override