diff options
| author | Jon Miranda <jonmiranda@google.com> | 2019-08-01 15:05:00 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-01 15:05:00 -0700 |
| commit | f20a7d252c927cc5eb3096495502131eec2dc5af (patch) | |
| tree | af17758f82c542532439469377d6af2a7b99f9c7 /quickstep/src | |
| parent | 1d7e474c69a2aa3a63688465f3b318b0d022890e (diff) | |
| parent | 9da9a2bd212d222db429a769082215f42f26a93f (diff) | |
| download | android_packages_apps_Trebuchet-f20a7d252c927cc5eb3096495502131eec2dc5af.tar.gz android_packages_apps_Trebuchet-f20a7d252c927cc5eb3096495502131eec2dc5af.tar.bz2 android_packages_apps_Trebuchet-f20a7d252c927cc5eb3096495502131eec2dc5af.zip | |
Merge "Fix bug where rounded corners were being set despite being disabled." into ub-launcher3-qt-dev
am: 9da9a2bd21
Change-Id: Icae4fd3fef3ad221d45e8d9ecdcc018813d560f3
Diffstat (limited to 'quickstep/src')
| -rw-r--r-- | quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java index fc8d02a71..991408c64 100644 --- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java +++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java @@ -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 |